diff --git a/Server/YD_XinWei.Commons/Dto/Common/ProjectModeDto.cs b/Server/YD_XinWei.Commons/Dto/Common/ProjectModeDto.cs new file mode 100644 index 0000000..afb81a3 --- /dev/null +++ b/Server/YD_XinWei.Commons/Dto/Common/ProjectModeDto.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace YD_XinWei.Commons.Dto.Common +{ + public class ProjectModeDto + { + /// + /// Id + /// + public int Id { get; set; } + + /// + /// ProjectKind + /// + public int ProjectKind { get; set; } + + /// + ///名称 + /// + public string Name { get; set; } + } +} diff --git a/Server/YD_XinWei.Commons/Dto/Common/TestingProjectDto.cs b/Server/YD_XinWei.Commons/Dto/Common/TestingProjectDto.cs new file mode 100644 index 0000000..c01db80 --- /dev/null +++ b/Server/YD_XinWei.Commons/Dto/Common/TestingProjectDto.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace YD_XinWei.Commons.Dto.Common +{ + public class TestingProjectDto + { + /// + /// ProjectId + /// + public int ProjectId { get; set; } + + /// + ///名称 + /// + public string ProjectName { get; set; } + + /// + ///IsOpen + /// + public bool IsOpen { get; set; } + + /// + ///IsShow + /// + public bool IsShow { get; set; } + } +} diff --git a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll index fbe6e80..2b987ce 100644 Binary files a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb index ae7eaa6..a1cfe6e 100644 Binary files a/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs index c278318..f380473 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70d43af284df348d2d254f583eaacb0de1d3fa69")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+127a15267ac6ff77a5766dcb035bd2e04cf6e8e7")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Commons")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache index aa08d87..1a12541 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache @@ -1 +1 @@ -ce68276a588caa211997cf3f0197765da463244d81ba379152682f27f77ac5f5 +bcf72474e9b0f9dd6729035be1d7411654cf56b0d6aec07d76313a08c3eadebd diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.csproj.CoreCompileInputs.cache b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.csproj.CoreCompileInputs.cache index f9cd9b3..4e4bcaf 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.csproj.CoreCompileInputs.cache +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -ae2c042a8b7be6ecb432a4aec32dc0838c6aae4cc68bd1835150f3e11c091bd9 +7f0097b9c9483ad5924401ecf60bd55c6f94347d4ba5a3b24df84377f95fd199 diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll index fbe6e80..2b987ce 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb index ae7eaa6..a1cfe6e 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json index 9e50132..b4110f5 100644 --- a/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json +++ b/Server/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.sourcelink.json @@ -1 +1 @@ -{"documents":{"C:\\Users\\HHST102\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=70d43af284df348d2d254f583eaacb0de1d3fa69&path=/*"}} \ No newline at end of file +{"documents":{"C:\\Users\\HHST102\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=127a15267ac6ff77a5766dcb035bd2e04cf6e8e7&path=/*"}} \ No newline at end of file diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll index 06130d3..25c2c19 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll b/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll index 06130d3..25c2c19 100644 Binary files a/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll and b/Server/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei/Controllers/HomeWorkController.cs b/Server/YD_XinWei/Controllers/HomeWorkController.cs index c88803c..cea5918 100644 --- a/Server/YD_XinWei/Controllers/HomeWorkController.cs +++ b/Server/YD_XinWei/Controllers/HomeWorkController.cs @@ -40,7 +40,6 @@ namespace YD_XinWei.Api.Controllers /// /// [HttpGet("HomeWorkRecord")] - [AllowAnonymous] public async Task> HomeWorkRecord(string teacherPhoneNo) { var res = await _homeWorkService.HomeWorkRecord(teacherPhoneNo); diff --git a/Server/YD_XinWei/Controllers/XinWeiController.cs b/Server/YD_XinWei/Controllers/XinWeiController.cs index e494863..59ae470 100644 --- a/Server/YD_XinWei/Controllers/XinWeiController.cs +++ b/Server/YD_XinWei/Controllers/XinWeiController.cs @@ -1,35 +1,47 @@ -using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using YD_XinWei.Api.Services.Impl; using YD_XinWei.Api.Services.Interface; +using YD_XinWei.Commons.Dto.Common; using YD_XinWei.Commons.Dto.HomeWork; using YD_XinWei.Commons.Dto.School; namespace YD_XinWei.Api.Controllers { /// - /// 作业 + /// 芯未 /// - [ApiController] - [ApiExplorerSettings(GroupName = "v1")] - [Route("[controller]")] + [ApiVersion("1.0")] + [Route("sports/{apiVersion}/common")] + [AllowAnonymous] public class XinWeiController : ControllerBase { - private readonly IHomeWorkService _homeWorkService; - public XinWeiController(IHomeWorkService homeWorkService) + private readonly IXinWeiService _xinWeiService; + public XinWeiController(IXinWeiService xinWeiService) { - _homeWorkService = homeWorkService; + _xinWeiService = xinWeiService; } /// - /// 作业记录 + /// 获取项目模式列表 /// - /// /// - [HttpGet("HomeWorkRecord")] - public async Task> HomeWorkRecord(string teacherPhoneNo) + [HttpGet("getSportsModelTypeList")] + public async Task> GetSportsModelTypeList() { - var res = await _homeWorkService.HomeWorkRecord(teacherPhoneNo); + var res = await _xinWeiService.SportsModelTypeList(); + return res; + } + + /// + /// 获取体育项目列表 + /// + /// + [HttpGet("getOrgSportsProjectList")] + public async Task> GetOrgSportsProjectList(int orgId) + { + var res = await _xinWeiService.OrgSportsProjectList(orgId); return res; } } diff --git a/Server/YD_XinWei/Services/Impl/XinWeiService.cs b/Server/YD_XinWei/Services/Impl/XinWeiService.cs new file mode 100644 index 0000000..e2db77f --- /dev/null +++ b/Server/YD_XinWei/Services/Impl/XinWeiService.cs @@ -0,0 +1,50 @@ +using AutoMapper; +using Microsoft.EntityFrameworkCore; +using System.Collections.Generic; +using YD_XinWei.Api.Context; +using YD_XinWei.Api.Services.Interface; +using YD_XinWei.Api.SmartSportsEntitys; +using YD_XinWei.Api.Utilities; +using YD_XinWei.Commons.Dto.Common; +using YD_XinWei.Commons.Dto.HomeWork; +using YD_XinWei.Commons.Dto.School; + +namespace YD_XinWei.Api.Services.Impl +{ + public class XinWeiService : IXinWeiService + { + public SmartSportsContext _sportsContext; + private readonly IMapper _mapper; + + public XinWeiService(SmartSportsContext sportsContext, IMapper mapper) + { + _sportsContext = sportsContext; + _mapper = mapper; + } + public async Task> SportsModelTypeList() + { + var res = await _sportsContext.XW_ProjectMode.Select(x => new ProjectModeDto() + { + Id = x.Id, + ProjectKind = x.ProjectKind, + Name = x.Name + }).ToListAsync(); + + return res; + } + + public async Task> OrgSportsProjectList(int orgId) + { + var res = await _sportsContext.XW_TestingProject.Where(x => x.OrgId == orgId).Select(x => new TestingProjectDto() + { + ProjectId = x.ProjectId, + IsOpen = x.IsOpen, + IsShow = x.IsShow, + ProjectName = x.ProjectName + + }).ToListAsync(); + + return res; + } + } +} diff --git a/Server/YD_XinWei/Services/Interface/IXinWeiService.cs b/Server/YD_XinWei/Services/Interface/IXinWeiService.cs index f47dbfc..ade86ad 100644 --- a/Server/YD_XinWei/Services/Interface/IXinWeiService.cs +++ b/Server/YD_XinWei/Services/Interface/IXinWeiService.cs @@ -3,6 +3,7 @@ using TGJ.NetworkFreight.SeckillAggregateServices.Pos.UserService; using YD_XinWei.Api; using YD_XinWei.Api.Entitys; using YD_XinWei.Commons; +using YD_XinWei.Commons.Dto.Common; using YD_XinWei.Commons.Dto.HomeWork; using YD_XinWei.Commons.Dto.School; @@ -11,17 +12,16 @@ namespace YD_XinWei.Api.Services.Interface public interface IXinWeiService { /// - /// 作业记录 + /// 项目模式 /// - /// /// - Task> HomeWorkRecord(string teacherPhoneNo); + Task> SportsModelTypeList(); /// - /// 作业详情 + /// 体育项目 /// - /// + /// 学校Id /// - Task HomeWorkDetails(int homeWorkId); + Task> OrgSportsProjectList(int orgId); } } diff --git a/Server/YD_XinWei/SmartSportsEntitys/XW_TestingProject.cs b/Server/YD_XinWei/SmartSportsEntitys/XW_TestingProject.cs index e933b43..3e7c3f2 100644 --- a/Server/YD_XinWei/SmartSportsEntitys/XW_TestingProject.cs +++ b/Server/YD_XinWei/SmartSportsEntitys/XW_TestingProject.cs @@ -21,6 +21,14 @@ namespace YD_XinWei.Api.SmartSportsEntitys [Comment("Id")] public int Id { get; set; } + /// + /// 学校Id + /// + [Display(Name = "OrgId")] + [Comment("OrgId")] + [Column(TypeName = "int")] + public int OrgId { get; set; } + /// /// ProjectId /// @@ -35,7 +43,7 @@ namespace YD_XinWei.Api.SmartSportsEntitys [Display(Name = "名称")] [Comment("名称")] [Column(TypeName = "nvarchar(100)")] - public string Name { get; set; } + public string ProjectName { get; set; } /// ///IsOpen diff --git a/Server/YD_XinWei/Startup.cs b/Server/YD_XinWei/Startup.cs index 6af5424..4cf840f 100644 --- a/Server/YD_XinWei/Startup.cs +++ b/Server/YD_XinWei/Startup.cs @@ -23,6 +23,7 @@ using YD_XinWei.Api.Context; using YD_XinWei.Api.Extensions; using System.Text.Json; using VYD_XinWei.Commons.Filters; +using Microsoft.AspNetCore.Mvc.Versioning; namespace YD_XinWei.Api { @@ -63,6 +64,8 @@ namespace YD_XinWei.Api services.AddScoped(); services.AddScoped(); + services.AddScoped(); + services.AddScoped(); services.AddSession(); services.AddMemoryCache(); @@ -99,6 +102,14 @@ namespace YD_XinWei.Api } }; }); + + services.AddApiVersioning(options => + { + // 默认情况下,API 版本是必需的,通过 URL 进行版本控制 + options.ApiVersionReader = new UrlSegmentApiVersionReader(); + options.ReportApiVersions = true; + }); + // 全局应用认证策略 services.AddControllers(options => { diff --git a/Server/YD_XinWei/YD_XinWei.Api.csproj b/Server/YD_XinWei/YD_XinWei.Api.csproj index 8aedb47..71828f6 100644 --- a/Server/YD_XinWei/YD_XinWei.Api.csproj +++ b/Server/YD_XinWei/YD_XinWei.Api.csproj @@ -30,6 +30,7 @@ + all diff --git a/Server/YD_XinWei/appsettings.json b/Server/YD_XinWei/appsettings.json index 3e042a9..681f38a 100644 --- a/Server/YD_XinWei/appsettings.json +++ b/Server/YD_XinWei/appsettings.json @@ -26,9 +26,12 @@ "AppUrls": { }, - "DbConnectionString": " Data Source=101.132.164.149;Database=YD_XinWeiDB;User ID=sa;Password=Admin@123;Connect Timeout=500;", - "SmartSportsString": " Data Source=101.132.164.149;Database=SmartSportsServerDB_QA;User ID=sa;Password=Admin@123;Connect Timeout=500;", - "CorsUrls": "http://localhost:8081,http://localhost:8080,http://localhost:7080,http://localhost:9980,http://127.0.0.1:9993,http://localhost:9993", + //"DbConnectionString": " Data Source=101.132.164.149;Database=YD_XinWeiDB;User ID=sa;Password=Admin@123;Connect Timeout=500;", + //"SmartSportsString": " Data Source=101.132.164.149;Database=SmartSportsServerDB_QA;User ID=sa;Password=Admin@123;Connect Timeout=500;", + + "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", "WeChat": { "Appid": "xxx", diff --git a/Server/YD_XinWei/bin/Debug/net6.0/Microsoft.AspNetCore.Mvc.Versioning.dll b/Server/YD_XinWei/bin/Debug/net6.0/Microsoft.AspNetCore.Mvc.Versioning.dll new file mode 100644 index 0000000..4cc2b47 Binary files /dev/null and b/Server/YD_XinWei/bin/Debug/net6.0/Microsoft.AspNetCore.Mvc.Versioning.dll differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.deps.json b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.deps.json index d9379cf..1f6655f 100644 --- a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.deps.json +++ b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.deps.json @@ -12,6 +12,7 @@ "Autofac.Extensions.DependencyInjection": "10.0.0", "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.0", "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "6.0.0", + "Microsoft.AspNetCore.Mvc.Versioning": "5.1.0", "Microsoft.EntityFrameworkCore": "6.0.0", "Microsoft.EntityFrameworkCore.Design": "6.0.0", "Microsoft.EntityFrameworkCore.SqlServer": "6.0.0", @@ -139,6 +140,14 @@ } } }, + "Microsoft.AspNetCore.Mvc.Versioning/5.1.0": { + "runtime": { + "lib/net6.0/Microsoft.AspNetCore.Mvc.Versioning.dll": { + "assemblyVersion": "5.1.0.0", + "fileVersion": "5.1.8270.41513" + } + } + }, "Microsoft.AspNetCore.Routing.Abstractions/2.2.0": { "dependencies": { "Microsoft.AspNetCore.Http.Abstractions": "2.2.0" @@ -770,6 +779,13 @@ "path": "microsoft.aspnetcore.mvc.newtonsoftjson/6.0.0", "hashPath": "microsoft.aspnetcore.mvc.newtonsoftjson.6.0.0.nupkg.sha512" }, + "Microsoft.AspNetCore.Mvc.Versioning/5.1.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-UX8w9BlCiZpr6Ox4YAve1w0CkI1CAovukGNzKd7v0+5pZc8lzuG5tRovucr1RWIKHs0E/Yx8563CN7KzaB3bpw==", + "path": "microsoft.aspnetcore.mvc.versioning/5.1.0", + "hashPath": "microsoft.aspnetcore.mvc.versioning.5.1.0.nupkg.sha512" + }, "Microsoft.AspNetCore.Routing.Abstractions/2.2.0": { "type": "package", "serviceable": true, diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll index 6725596..b3576e5 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe index 2953b07..9df41cb 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.exe differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb index 617ae6d..3735205 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml index 01d47cf..6315a1d 100644 --- a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml +++ b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Api.xml @@ -117,14 +117,19 @@ - 作业 + 芯未 - + - 作业记录 + 获取项目模式列表 + + + + + + 获取体育项目列表 - @@ -342,18 +347,17 @@ - + - 作业记录 + 项目模式 - - + - 作业详情 + 体育项目 - + 学校Id @@ -946,12 +950,17 @@ Id + + + 学校Id + + ProjectId - + 名称 diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll index fbe6e80..2b987ce 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb index ae7eaa6..a1cfe6e 100644 Binary files a/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb and b/Server/YD_XinWei/bin/Debug/net6.0/YD_XinWei.Commons.pdb differ diff --git a/Server/YD_XinWei/bin/Debug/net6.0/appsettings.json b/Server/YD_XinWei/bin/Debug/net6.0/appsettings.json index 3e042a9..681f38a 100644 --- a/Server/YD_XinWei/bin/Debug/net6.0/appsettings.json +++ b/Server/YD_XinWei/bin/Debug/net6.0/appsettings.json @@ -26,9 +26,12 @@ "AppUrls": { }, - "DbConnectionString": " Data Source=101.132.164.149;Database=YD_XinWeiDB;User ID=sa;Password=Admin@123;Connect Timeout=500;", - "SmartSportsString": " Data Source=101.132.164.149;Database=SmartSportsServerDB_QA;User ID=sa;Password=Admin@123;Connect Timeout=500;", - "CorsUrls": "http://localhost:8081,http://localhost:8080,http://localhost:7080,http://localhost:9980,http://127.0.0.1:9993,http://localhost:9993", + //"DbConnectionString": " Data Source=101.132.164.149;Database=YD_XinWeiDB;User ID=sa;Password=Admin@123;Connect Timeout=500;", + //"SmartSportsString": " Data Source=101.132.164.149;Database=SmartSportsServerDB_QA;User ID=sa;Password=Admin@123;Connect Timeout=500;", + + "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", "WeChat": { "Appid": "xxx", diff --git a/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json b/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json index 6bb358b..806b454 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json +++ b/Server/YD_XinWei/obj/Debug/net6.0/ApiEndpoints.json @@ -67,6 +67,63 @@ } ] }, + { + "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", + "Method": "GetOrgSportsProjectList", + "RelativePath": "sports/{apiVersion}/common/getOrgSportsProjectList", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "orgId", + "Type": "System.Int32", + "IsRequired": false + }, + { + "Name": "apiVersion", + "Type": "", + "IsRequired": true + } + ], + "ReturnTypes": [ + { + "Type": "System.Collections.Generic.List\u00601[[YD_XinWei.Commons.Dto.Common.TestingProjectDto, YD_XinWei.Commons, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, + { + "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", + "Method": "GetSportsModelTypeList", + "RelativePath": "sports/{apiVersion}/common/getSportsModelTypeList", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "apiVersion", + "Type": "", + "IsRequired": true + } + ], + "ReturnTypes": [ + { + "Type": "System.Collections.Generic.List\u00601[[YD_XinWei.Commons.Dto.Common.ProjectModeDto, YD_XinWei.Commons, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, { "ContainingType": "YD_XinWei.Api.Controllers.StudentController", "Method": "ClassListbyTeacher", @@ -304,31 +361,5 @@ "StatusCode": 200 } ] - }, - { - "ContainingType": "YD_XinWei.Api.Controllers.XinWeiController", - "Method": "HomeWorkRecord", - "RelativePath": "XinWei/HomeWorkRecord", - "HttpMethod": "GET", - "IsController": true, - "Order": 0, - "Parameters": [ - { - "Name": "teacherPhoneNo", - "Type": "System.String", - "IsRequired": false - } - ], - "ReturnTypes": [ - { - "Type": "System.Collections.Generic.List\u00601[[YD_XinWei.Commons.Dto.HomeWork.HomeWorkRecordDto, YD_XinWei.Commons, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null]]", - "MediaTypes": [ - "text/plain", - "application/json", - "text/json" - ], - "StatusCode": 200 - } - ] } ] \ No newline at end of file diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs index 9226be7..7fdf20d 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+70d43af284df348d2d254f583eaacb0de1d3fa69")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+127a15267ac6ff77a5766dcb035bd2e04cf6e8e7")] [assembly: System.Reflection.AssemblyProductAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyTitleAttribute("YD_XinWei.Api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache index 1c2b209..0ec5bf8 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -504a981d8e5bfc245b13500d99551b70f3b7b5d16e51c5f5c6301f52f13280cb +e13c62df195b49c431dd4152f653283fabd1fe2e9cc6d230c4259669841016b9 diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.MvcApplicationPartsAssemblyInfo.cs b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.MvcApplicationPartsAssemblyInfo.cs index d593f35..e152e09 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.MvcApplicationPartsAssemblyInfo.cs +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.MvcApplicationPartsAssemblyInfo.cs @@ -11,6 +11,7 @@ using System; using System.Reflection; +[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Microsoft.AspNetCore.Mvc.Versioning")] [assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Swashbuckle.AspNetCore.SwaggerGen")] [assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("YD_XinWei.Commons")] diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache index 8d59dcc..452e649 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache index 3ba674c..5b4d40f 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache index 0ca4823..abfc871 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e9cf56b89a9297acd0bed64224cf227650e313122bac9e962c8a484ed69408f8 +d70fd92c395ed744de7a9144125d49cf4accc6abbfc0254cd7042f0cab165eae diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.FileListAbsolute.txt b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.FileListAbsolute.txt index 1bb90e0..90f33a5 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.FileListAbsolute.txt +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.FileListAbsolute.txt @@ -264,3 +264,4 @@ C:\Users\HHST102\Desktop\Code\YD_XinWei\Server\YD_XinWei\obj\Debug\net6.0\YD_Xin C:\Users\HHST102\Desktop\Code\YD_XinWei\Server\YD_XinWei\obj\Debug\net6.0\YD_XinWei.Api.pdb C:\Users\HHST102\Desktop\Code\YD_XinWei\Server\YD_XinWei\obj\Debug\net6.0\YD_XinWei.Api.genruntimeconfig.cache C:\Users\HHST102\Desktop\Code\YD_XinWei\Server\YD_XinWei\obj\Debug\net6.0\ref\YD_XinWei.Api.dll +C:\Users\HHST102\Desktop\Code\YD_XinWei\Server\YD_XinWei\bin\Debug\net6.0\Microsoft.AspNetCore.Mvc.Versioning.dll diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll index 6725596..b3576e5 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb index 617ae6d..3735205 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb and b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json index 9e50132..b4110f5 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.sourcelink.json @@ -1 +1 @@ -{"documents":{"C:\\Users\\HHST102\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=70d43af284df348d2d254f583eaacb0de1d3fa69&path=/*"}} \ No newline at end of file +{"documents":{"C:\\Users\\HHST102\\Desktop\\Code\\YD_XinWei\\*":"https://dev.azure.com/tanglong10081/YD_XinWei/_apis/git/repositories/YD_XinWei/items?api-version=1.0&versionType=commit&version=127a15267ac6ff77a5766dcb035bd2e04cf6e8e7&path=/*"}} \ No newline at end of file diff --git a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml index 01d47cf..6315a1d 100644 --- a/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml +++ b/Server/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml @@ -117,14 +117,19 @@ - 作业 + 芯未 - + - 作业记录 + 获取项目模式列表 + + + + + + 获取体育项目列表 - @@ -342,18 +347,17 @@ - + - 作业记录 + 项目模式 - - + - 作业详情 + 体育项目 - + 学校Id @@ -946,12 +950,17 @@ Id + + + 学校Id + + ProjectId - + 名称 diff --git a/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe b/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe index 2953b07..9df41cb 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe and b/Server/YD_XinWei/obj/Debug/net6.0/apphost.exe differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll index 574abd0..8b21dee 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll b/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll index 574abd0..8b21dee 100644 Binary files a/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll and b/Server/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll differ diff --git a/Server/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json b/Server/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json index 85f07bb..0577391 100644 --- a/Server/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json +++ b/Server/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json @@ -157,6 +157,10 @@ "target": "Package", "version": "[6.0.0, )" }, + "Microsoft.AspNetCore.Mvc.Versioning": { + "target": "Package", + "version": "[5.1.0, )" + }, "Microsoft.EntityFrameworkCore": { "target": "Package", "version": "[6.0.0, )" diff --git a/Server/YD_XinWei/obj/project.assets.json b/Server/YD_XinWei/obj/project.assets.json index c781439..ac21012 100644 --- a/Server/YD_XinWei/obj/project.assets.json +++ b/Server/YD_XinWei/obj/project.assets.json @@ -197,6 +197,22 @@ "Microsoft.AspNetCore.App" ] }, + "Microsoft.AspNetCore.Mvc.Versioning/5.1.0": { + "type": "package", + "compile": { + "lib/net6.0/Microsoft.AspNetCore.Mvc.Versioning.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/net6.0/Microsoft.AspNetCore.Mvc.Versioning.dll": { + "related": ".pdb;.xml" + } + }, + "frameworkReferences": [ + "Microsoft.AspNetCore.App" + ] + }, "Microsoft.AspNetCore.Routing.Abstractions/2.2.0": { "type": "package", "dependencies": { @@ -1376,6 +1392,29 @@ "microsoft.aspnetcore.mvc.newtonsoftjson.nuspec" ] }, + "Microsoft.AspNetCore.Mvc.Versioning/5.1.0": { + "sha512": "UX8w9BlCiZpr6Ox4YAve1w0CkI1CAovukGNzKd7v0+5pZc8lzuG5tRovucr1RWIKHs0E/Yx8563CN7KzaB3bpw==", + "type": "package", + "path": "microsoft.aspnetcore.mvc.versioning/5.1.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE.txt", + "README.md", + "icon.png", + "lib/net5.0/Microsoft.AspNetCore.Mvc.Versioning.dll", + "lib/net5.0/Microsoft.AspNetCore.Mvc.Versioning.pdb", + "lib/net5.0/Microsoft.AspNetCore.Mvc.Versioning.xml", + "lib/net6.0/Microsoft.AspNetCore.Mvc.Versioning.dll", + "lib/net6.0/Microsoft.AspNetCore.Mvc.Versioning.pdb", + "lib/net6.0/Microsoft.AspNetCore.Mvc.Versioning.xml", + "lib/netcoreapp3.1/Microsoft.AspNetCore.Mvc.Versioning.dll", + "lib/netcoreapp3.1/Microsoft.AspNetCore.Mvc.Versioning.pdb", + "lib/netcoreapp3.1/Microsoft.AspNetCore.Mvc.Versioning.xml", + "microsoft.aspnetcore.mvc.versioning.5.1.0.nupkg.sha512", + "microsoft.aspnetcore.mvc.versioning.nuspec" + ] + }, "Microsoft.AspNetCore.Routing.Abstractions/2.2.0": { "sha512": "lRRaPN7jDlUCVCp9i0W+PB0trFaKB0bgMJD7hEJS9Uo4R9MXaMC8X2tJhPLmeVE3SGDdYI4QNKdVmhNvMJGgPQ==", "type": "package", @@ -3106,6 +3145,7 @@ "Autofac.Extensions.DependencyInjection >= 10.0.0", "Microsoft.AspNetCore.Authentication.JwtBearer >= 6.0.0", "Microsoft.AspNetCore.Mvc.NewtonsoftJson >= 6.0.0", + "Microsoft.AspNetCore.Mvc.Versioning >= 5.1.0", "Microsoft.EntityFrameworkCore >= 6.0.0", "Microsoft.EntityFrameworkCore.Design >= 6.0.0", "Microsoft.EntityFrameworkCore.SqlServer >= 6.0.0", @@ -3185,6 +3225,10 @@ "target": "Package", "version": "[6.0.0, )" }, + "Microsoft.AspNetCore.Mvc.Versioning": { + "target": "Package", + "version": "[5.1.0, )" + }, "Microsoft.EntityFrameworkCore": { "target": "Package", "version": "[6.0.0, )" diff --git a/Server/YD_XinWei/obj/project.nuget.cache b/Server/YD_XinWei/obj/project.nuget.cache index 51e9975..84db6cb 100644 --- a/Server/YD_XinWei/obj/project.nuget.cache +++ b/Server/YD_XinWei/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "CJbEgklx6gE=", + "dgSpecHash": "J6W1Li31shw=", "success": true, "projectFilePath": "C:\\Users\\HHST102\\Desktop\\Code\\YD_XinWei\\Server\\YD_XinWei\\YD_XinWei.Api.csproj", "expectedPackageFiles": [ @@ -16,6 +16,7 @@ "C:\\Users\\HHST102\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\6.0.0\\microsoft.aspnetcore.jsonpatch.6.0.0.nupkg.sha512", "C:\\Users\\HHST102\\.nuget\\packages\\microsoft.aspnetcore.mvc.abstractions\\2.2.0\\microsoft.aspnetcore.mvc.abstractions.2.2.0.nupkg.sha512", "C:\\Users\\HHST102\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\6.0.0\\microsoft.aspnetcore.mvc.newtonsoftjson.6.0.0.nupkg.sha512", + "C:\\Users\\HHST102\\.nuget\\packages\\microsoft.aspnetcore.mvc.versioning\\5.1.0\\microsoft.aspnetcore.mvc.versioning.5.1.0.nupkg.sha512", "C:\\Users\\HHST102\\.nuget\\packages\\microsoft.aspnetcore.routing.abstractions\\2.2.0\\microsoft.aspnetcore.routing.abstractions.2.2.0.nupkg.sha512", "C:\\Users\\HHST102\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\8.0.0\\microsoft.bcl.asyncinterfaces.8.0.0.nupkg.sha512", "C:\\Users\\HHST102\\.nuget\\packages\\microsoft.bcl.timeprovider\\8.0.1\\microsoft.bcl.timeprovider.8.0.1.nupkg.sha512",