diff --git a/YD_XinWei.Commons/Dto/HomeWork/AddHomeWorkDto.cs b/YD_XinWei.Commons/Dto/HomeWork/AddHomeWorkDto.cs deleted file mode 100644 index 7767fb3..0000000 --- a/YD_XinWei.Commons/Dto/HomeWork/AddHomeWorkDto.cs +++ /dev/null @@ -1,81 +0,0 @@ -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.HomeWork -{ - /// - /// 新增作业 - /// - public class AddHomeWorkDto - { - /// - ///作业名称 - /// - public string WorkName { get; set; } - - /// - ///作业内容 - /// - public string WorkText { get; set; } - - /// - /// 作业类型 - /// - public int WorkType { get; set; } - - /// - /// 学生范围 - /// - public int StudentScope { get; set; } - - /// - ///老师Id - /// - public int TeacherId { get; set; } - - /// - ///老师名称 - /// - public string TeacherName { get; set; } - - /// - ///年级Id - /// - public int GradeId { get; set; } - - /// - ///年级名称 - /// - public string GradeName { get; set; } - - /// - ///班级Id - /// - public int ClassId { get; set; } - - /// - ///班级名称 - /// - public string ClassName { get; set; } - - /// - ///开始时间 - /// - public DateTime StartTime { get; set; } - - /// - ///结束时间 - /// - public DateTime EndTime { get; set; } - - /// - /// 学生集合 - /// - public List HomeWorkStudents { get; set; } - } -} diff --git a/YD_XinWei.Commons/Dto/HomeWork/HomeWorkRecordDto.cs b/YD_XinWei.Commons/Dto/HomeWork/HomeWorkRecordDto.cs deleted file mode 100644 index 4322436..0000000 --- a/YD_XinWei.Commons/Dto/HomeWork/HomeWorkRecordDto.cs +++ /dev/null @@ -1,112 +0,0 @@ -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.HomeWork -{ - /// - /// 作业记录 - /// - public class HomeWorkRecordDto - { - /// - /// 作业Id - /// - public int Id { get; set; } - - /// - ///作业名称 - /// - public string WorkName { get; set; } - - /// - ///开始时间 - /// - public DateTime StartTime { get; set; } - - /// - ///结束时间 - /// - public DateTime EndTime { get; set; } - - /// - /// 作业状态 - /// - public int WorkStatus { get; set; } - } - - public class HomeWorkDetailsDto - { - /// - /// 作业Id - /// - public int Id { get; set; } - - /// - ///作业名称 - /// - public string WorkName { get; set; } - - /// - ///作业内容 - /// - public string WorkText { get; set; } - - /// - ///开始时间 - /// - public DateTime StartTime { get; set; } - - /// - ///结束时间 - /// - public DateTime EndTime { get; set; } - - /// - /// 学生范围 - /// - public int StudentScope { get; set; } - - /// - /// 学生集合 - /// - public List HomeWorkStudents { get; set; } - } - - public class HomeWorkStudentsDto - { - /// - ///学校编号 - /// - public string SchoolCode { get; set; } - - /// - ///学生学号 - /// - public string StudentNo { get; set; } - - /// - ///学生名称 - /// - public string StudentName { get; set; } - - /// - ///性别 - /// - public int Sex { get; set; } - - /// - ///学生照片 - /// - public string Photo { get; set; } - - /// - /// 学生作业状态 - /// - public int WorkStatus { get; set; } - } -} diff --git a/YD_XinWei.Commons/Dto/LargeScreen/LargeScreenDto.cs b/YD_XinWei.Commons/Dto/LargeScreen/LargeScreenDto.cs new file mode 100644 index 0000000..1b4463a --- /dev/null +++ b/YD_XinWei.Commons/Dto/LargeScreen/LargeScreenDto.cs @@ -0,0 +1,197 @@ +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.LargeScreen +{ + /// + /// 大屏数据 + /// + public class LargeScreenDto + { + /// + /// 基本信息 + /// + public BasicInfoDto BasicInfo { get; set; } = new BasicInfoDto(); + + /// + /// 各项目数据 + /// + public ItemDataDto ItemData { get; set; } = new ItemDataDto(); + + /// + /// 班级运动榜 + /// + public ClassSportsRankingDto ClassSportsRankList { get; set; } = new ClassSportsRankingDto(); + + /// + /// 各项目实时数据 + /// + public List ItemRealTimeResultList { get; set; } = new List(); + } + + /// + /// 基本信息 + /// + public class BasicInfoDto + { + /// + /// 男生人数 + /// + public int MaleCount { get; set; } + + /// + /// 女生人数 + /// + public int FemaleCount { get; set; } + + /// + /// 学生总人数（只读，自动计算） + /// + public int StudentCount => MaleCount + FemaleCount; + + /// + /// 本周训练次数 + /// + public int WeekTrainingCount { get; set; } + + /// + /// 同比增长 + /// + public int Increase { get; set; } + } + + /// + /// 各项目数据 + /// + public class ItemDataDto + { + /// + /// 项目id + /// + public int ProjectId { get; set; } + + /// + /// 项目优良率 + /// + public double ExcellentRate { get; set; } + + /// + /// 男生排名 + /// + public List MaleRankList { get; set; } + + /// + /// 女生排名 + /// + public List FemaleRankList { get; set; } + } + + /// + /// 学生成绩排名 + /// + public class StudentScoreRankingDto + { + /// + /// 排名 + /// + public int Rank { get; set; } + + /// + /// 学生学号 + /// + public string StudentNo { get; set; } + + /// + /// 学生姓名 + /// + public string StudentName { get; set; } + + /// + /// 成绩 + /// + public string Score { get; set; } + } + + /// + /// 班级运动榜 + /// + public class ClassSportsRankingDto + { + /// + /// 排名 + /// + public int Rank { get; set; } + + /// + /// 班级Id + /// + public int ClassId { get; set; } + + /// + /// 班级名称 + /// + public string ClassName { get; set; } + + /// + /// 运动次数 + /// + public int Count { get; set; } + } + + /// + /// 各项目实时成绩 + /// + public class ItemRealTimeResultDto + { + /// + /// 学生学号 + /// + public string StudentNo { get; set; } + + /// + /// 学生姓名 + /// + public string StudentName { get; set; } + + /// + ///学生照片 + /// + public string Photo { get; set; } + + /// + /// 年级班级名称 + /// + public int GradeAndClassName { get; set; } + + /// + /// 项目名称 + /// + public string ProjectName { get; set; } + + /// + /// 成绩 + /// + public int Result { get; set; } + + /// + /// 得分 + /// + public int Score { get; set; } + + /// + /// 等级 + /// + public string Rank { get; set; } + + /// + /// 创建时间 + /// + + public string CreateTime { get; set; } + } +} diff --git a/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll b/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll index 1960fb4..0b6db24 100644 Binary files a/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll and b/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb b/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb index 12188c3..1ea71a9 100644 Binary files a/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb and b/YD_XinWei.Commons/bin/Debug/net6.0/YD_XinWei.Commons.pdb differ diff --git a/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs b/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs index 23670cb..c93d2cd 100644 --- a/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfo.cs +++ b/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+dc262ec0f86c14b16059c84f412c1f71e8f999ff")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5ac1bdc673397775553b1f2074c48c9a91880574")] [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/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache b/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache index 113cdfe..a1dd863 100644 --- a/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache +++ b/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.AssemblyInfoInputs.cache @@ -1 +1 @@ -03677df9fbe6bfffea0082c975e1ef93021dd50ab9e83b42574831346ed0b1fd +dc8c1171cb7cdd2a9178f8a1f1100303d642d6f2a20a94ecb8325f6b59c9f350 diff --git a/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.csproj.CoreCompileInputs.cache b/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.csproj.CoreCompileInputs.cache index a9d790a..e170478 100644 --- a/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.csproj.CoreCompileInputs.cache +++ b/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -37202eee9409386a5d03c6326c30ea5c84ae83e55439c7dd87f6b2f6c13b7814 +bfd8ed8c304f502e34e9210109499703fe4789a3fa8c8f42ff81b7516d8c07e4 diff --git a/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll b/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll index 1960fb4..0b6db24 100644 Binary files a/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll and b/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.dll differ diff --git a/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb b/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb index 12188c3..1ea71a9 100644 Binary files a/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb and b/YD_XinWei.Commons/obj/Debug/net6.0/YD_XinWei.Commons.pdb differ diff --git a/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll b/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll index 989ee6a..53612ba 100644 Binary files a/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll and b/YD_XinWei.Commons/obj/Debug/net6.0/ref/YD_XinWei.Commons.dll differ diff --git a/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll b/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll index 989ee6a..53612ba 100644 Binary files a/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll and b/YD_XinWei.Commons/obj/Debug/net6.0/refint/YD_XinWei.Commons.dll differ diff --git a/YD_XinWei/Controllers/XinWeiController.cs b/YD_XinWei/Controllers/XinWeiController.cs index d812c6c..3cfb3f1 100644 --- a/YD_XinWei/Controllers/XinWeiController.cs +++ b/YD_XinWei/Controllers/XinWeiController.cs @@ -4,7 +4,6 @@ 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.Open; using YD_XinWei.Commons.Dto.School; diff --git a/YD_XinWei/Services/Impl/LargeScreenService.cs b/YD_XinWei/Services/Impl/LargeScreenService.cs new file mode 100644 index 0000000..1bdbb05 --- /dev/null +++ b/YD_XinWei/Services/Impl/LargeScreenService.cs @@ -0,0 +1,72 @@ +using AutoMapper; +using Microsoft.EntityFrameworkCore; +using VOL.Entity.DomainModels.XinWei; +using YD_XinWei.Api.Context; +using YD_XinWei.Api.Services.Interface; +using YD_XinWei.Commons.Dto.LargeScreen; +using YD_XinWei.Commons.MemoryCaches; + +namespace YD_XinWei.Api.Services.Impl +{ + /// + /// 大屏服务 + /// + public class LargeScreenService : ILargeScreenService + { + public SmartSportsContext _sportsContext; + private readonly IMapper _mapper; + private readonly ICacheService _caching; + + /// + /// 构造 + /// + /// + /// + public LargeScreenService(SmartSportsContext sportsContext, IMapper mapper, ICacheService caching) + { + _sportsContext = sportsContext; + _mapper = mapper; + _caching = caching; + } + /// + /// 项目成绩大屏数据 + /// + /// + /// + public async Task ItemResultLargeScreenData(int orgId) + { + var res = new LargeScreenDto(); + + var schoolCode = _caching.Get(orgId.ToString()); + + if (string.IsNullOrWhiteSpace(schoolCode)) + { + schoolCode = await _sportsContext.School.Where(x => x.Id == orgId).Select(x => x.SchoolCode).FirstAsync(); + _caching.Add(orgId.ToString(), schoolCode); + } + + var sportsTestDataKey = $"SportsTestData_{schoolCode}"; + + var studentInfo = await _sportsContext.Student.Where(x => x.SchoolCode == schoolCode).Select(x => x.Sex).ToListAsync(); + + res.BasicInfo.FemaleCount = studentInfo.Count(x => x == 2); + res.BasicInfo.MaleCount = studentInfo.Count(x => x == 1); + + var sportsTestData = _caching.Get>(sportsTestDataKey); + + if (sportsTestData == null || sportsTestData.Count == 0) + { + sportsTestData = await _sportsContext.XW_SportsTestData.Where(x => x.OrgId == orgId).ToListAsync(); + _caching.AddObject(sportsTestDataKey, sportsTestData, 3600); + } + + + + + + + + return res; + } + } +} diff --git a/YD_XinWei/Services/Impl/RedisCacheService.cs b/YD_XinWei/Services/Impl/RedisCacheService.cs new file mode 100644 index 0000000..fd37dcf --- /dev/null +++ b/YD_XinWei/Services/Impl/RedisCacheService.cs @@ -0,0 +1,122 @@ +using CSRedis; +using Newtonsoft.Json; +using YD_XinWei.Api.Services.Interface; +using YD_XinWei.Api.Utilities; + +namespace YD_XinWei.Api.Services.Impl +{ + public class RedisCacheService : ICacheService + { + public RedisCacheService() + { + var csredis = new CSRedisClient(AppSettings.RedisConnectionString); + RedisHelper.Initialization(csredis); + } + + /// + /// 验证缓存项是否存在 + /// + /// 缓存Key + /// + public bool Exists(string key) + { + if (key == null) + { + throw new ArgumentNullException(nameof(key)); + } + return RedisHelper.Exists(key); + } + + public void LPush(string key, string val) + { + RedisHelper.LPush(key, val); + } + + public void RPush(string key, string val) + { + RedisHelper.RPush(key, val); + } + + public T ListDequeue(string key) where T : class + { + string value = RedisHelper.RPop(key); + if (string.IsNullOrEmpty(value)) + return null; + return JsonConvert.DeserializeObject(value); + } + + public object ListDequeue(string key) + { + string value = RedisHelper.RPop(key); + if (string.IsNullOrEmpty(value)) + return null; + return value; + } + + /// + /// 移除list中的数据，keepIndex为保留的位置到最后一个元素如list 元素为1.2.3.....100 + /// 需要移除前3个数，keepindex应该为4 + /// + /// + /// + public void ListRemove(string key, int keepIndex) + { + RedisHelper.LTrim(key, keepIndex, -1); + } + + public bool Add(string key, string value, int expireSeconds = -1, bool isSliding = false) + { + return RedisHelper.Set(key, value, expireSeconds); + } + + public bool AddObject(string key, object value, int expireSeconds = -1, bool isSliding = false) + { + return RedisHelper.Set(key, value, expireSeconds); + } + + /// + /// 删除缓存 + /// + /// 缓存Key + /// + public bool Remove(string key) + { + RedisHelper.Del(key); + return true; + } + + /// + /// 批量删除缓存 + /// + /// 缓存Key集合 + /// + public void RemoveAll(IEnumerable keys) + { + RedisHelper.Del(keys.ToArray()); + } + + /// + /// 获取缓存 + /// + /// 缓存Key + /// + public T Get(string key) where T : class + { + return RedisHelper.Get(key); + } + + /// + /// 获取缓存 + /// + /// 缓存Key + /// + public string Get(string key) + { + return RedisHelper.Get(key); + } + + public void Dispose() + { + } + } +} \ No newline at end of file diff --git a/YD_XinWei/Services/Impl/XinWeiService.cs b/YD_XinWei/Services/Impl/XinWeiService.cs index 422d928..69d887f 100644 --- a/YD_XinWei/Services/Impl/XinWeiService.cs +++ b/YD_XinWei/Services/Impl/XinWeiService.cs @@ -8,7 +8,6 @@ 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.Open; using YD_XinWei.Commons.Dto.School; using static Microsoft.EntityFrameworkCore.DbLoggerCategory; diff --git a/YD_XinWei/Services/Interface/ICacheService.cs b/YD_XinWei/Services/Interface/ICacheService.cs new file mode 100644 index 0000000..b6cbaf3 --- /dev/null +++ b/YD_XinWei/Services/Interface/ICacheService.cs @@ -0,0 +1,86 @@ +using YD_XinWei.Commons.Dto.LargeScreen; +using YD_XinWei.Commons.Dto.Open; + +namespace YD_XinWei.Api.Services.Interface +{ + public interface ICacheService + { + /// + /// 验证缓存项是否存在 + /// + /// 缓存Key + /// + bool Exists(string key); + + /// + /// List写入head + /// + /// + /// + void LPush(string key, string val); + + void RPush(string key, string val); + + /// + /// List出队 lpop + /// + /// + /// + object ListDequeue(string key); + + /// + /// List出队 lpop + /// + /// + /// + T ListDequeue(string key) where T : class; + + /// + /// 移除list中的数据，keepIndex为保留的位置到最后一个元素如list 元素为1.2.3.....100 + /// 需要移除前3个数，keepindex应该为4 + /// + /// + /// + void ListRemove(string key, int keepIndex); + + /// + /// 添加缓存 + /// + /// 缓存Key + /// 缓存Value + /// 缓存时长 + /// 是否滑动过期（如果在过期时间内有操作，则以当前时间点延长过期时间） //new TimeSpan(0, 60, 0); + /// + bool AddObject(string key, object value, int expireSeconds = -1, bool isSliding = false); + + bool Add(string key, string value, int expireSeconds = -1, bool isSliding = false); + + /// + /// 删除缓存 + /// + /// 缓存Key + /// + bool Remove(string key); + + /// + /// 批量删除缓存 + /// + /// 缓存Key集合 + /// + void RemoveAll(IEnumerable keys); + + /// + /// 获取缓存 + /// + /// 缓存Key + /// + T Get(string key) where T : class; + + /// + /// 获取缓存 + /// + /// 缓存Key + /// + string Get(string key); + } +} \ No newline at end of file diff --git a/YD_XinWei/Services/Interface/ILargeScreenService.cs b/YD_XinWei/Services/Interface/ILargeScreenService.cs new file mode 100644 index 0000000..36e1052 --- /dev/null +++ b/YD_XinWei/Services/Interface/ILargeScreenService.cs @@ -0,0 +1,18 @@ +using YD_XinWei.Commons.Dto.LargeScreen; +using YD_XinWei.Commons.Dto.Open; + +namespace YD_XinWei.Api.Services.Interface +{ + /// + /// 大屏服务接口 + /// + public interface ILargeScreenService + { + /// + /// 项目成绩大屏数据 + /// + /// + /// + Task ItemResultLargeScreenData(int orgId); + } +} diff --git a/YD_XinWei/Services/Interface/IXinWeiService.cs b/YD_XinWei/Services/Interface/IXinWeiService.cs index 8d4d295..af14b4a 100644 --- a/YD_XinWei/Services/Interface/IXinWeiService.cs +++ b/YD_XinWei/Services/Interface/IXinWeiService.cs @@ -4,7 +4,6 @@ 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.Open; using YD_XinWei.Commons.Dto.School; diff --git a/YD_XinWei/Startup.cs b/YD_XinWei/Startup.cs index c2ca054..d1a6e8e 100644 --- a/YD_XinWei/Startup.cs +++ b/YD_XinWei/Startup.cs @@ -63,7 +63,8 @@ namespace YD_XinWei.Api services.AddScoped(); - services.AddScoped(); + //services.AddScoped(); + services.AddScoped(); services.AddSession(); services.AddMemoryCache(); services.AddHttpContextAccessor(); diff --git a/YD_XinWei/Utilities/AppSettings.cs b/YD_XinWei/Utilities/AppSettings.cs index c8a58f4..0e0d0e6 100644 --- a/YD_XinWei/Utilities/AppSettings.cs +++ b/YD_XinWei/Utilities/AppSettings.cs @@ -9,6 +9,7 @@ public static string DbConnectionString { get; set; } public static string SmartSportsString { get; set; } + public static string RedisConnectionString { get; set; } public static string[] CorsUrls { get; set; } public static WeChatConfig WeChat { get; set; } diff --git a/YD_XinWei/YD_XinWei.Api.csproj b/YD_XinWei/YD_XinWei.Api.csproj index 278f32c..9878642 100644 --- a/YD_XinWei/YD_XinWei.Api.csproj +++ b/YD_XinWei/YD_XinWei.Api.csproj @@ -30,6 +30,7 @@ + diff --git a/YD_XinWei/appsettings.json b/YD_XinWei/appsettings.json index 681f38a..ea825fb 100644 --- a/YD_XinWei/appsettings.json +++ b/YD_XinWei/appsettings.json @@ -26,6 +26,8 @@ "AppUrls": { }, + "RedisConnectionString": "8.153.108.90,Password=yd708090,SyncTimeout=15000,defaultDatabase=6", + //"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;", diff --git a/YD_XinWei/obj/Debug/net6.0/YD_XinWe.7845F25F.Up2Date b/YD_XinWei/obj/Debug/net6.0/YD_XinWe.7845F25F.Up2Date deleted file mode 100644 index e69de29..0000000 diff --git a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs index 48cc9de..80d6495 100644 --- a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfo.cs +++ b/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+dc262ec0f86c14b16059c84f412c1f71e8f999ff")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5ac1bdc673397775553b1f2074c48c9a91880574")] [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/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache index 6f19482..e85e58b 100644 --- a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache +++ b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.AssemblyInfoInputs.cache @@ -1 +1 @@ -f27a190f1971429e810ac6eba4f1fd5386ffcf942db62d518a0da6168ecda63a +9e4c6efeba01e421e9b7a8e0a349cdf7d23535612c6ae4e200177537845e725a diff --git a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache index 58b0774..262c91c 100644 Binary files a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache and b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.assets.cache differ diff --git a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache index 7a3e65c..479ba6c 100644 Binary files a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache and b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.AssemblyReference.cache differ diff --git a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache index 0cb08c9..9b1a228 100644 --- a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache +++ b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -122bf4be167545f44a8b98bc77d1c63213a00809cdc85093619d034dd57ebcf4 +865c74e4ba95345005e474337c34e111448b55af02c1f64ff56790fae61dda63 diff --git a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll deleted file mode 100644 index 411c1a4..0000000 Binary files a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.dll and /dev/null differ diff --git a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.genruntimeconfig.cache b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.genruntimeconfig.cache deleted file mode 100644 index 6abbaa0..0000000 --- a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.genruntimeconfig.cache +++ /dev/null @@ -1 +0,0 @@ -7b5af5f617f5a81707f8229723421712fcc945fcf46e84c8e7f12fea3d33dfa2 diff --git a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb deleted file mode 100644 index 646b999..0000000 Binary files a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.pdb and /dev/null differ diff --git a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml b/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml deleted file mode 100644 index 1b7d1b9..0000000 --- a/YD_XinWei/obj/Debug/net6.0/YD_XinWei.Api.xml +++ /dev/null @@ -1,1784 +0,0 @@ - - - - YD_XinWei.Api - - - - - 用户服务上下文 - - - - - 用户服务上下文 - - - - - 芯未 - - - - - 获取设备信息 - - - - - - 获取项目模式列表 - - - - - - 获取体育项目列表 - - - - - - 获取学生信息 - - - - - - 获取人脸信息 - - - - - - - 查询训练评分规则 - - - - - - - 新增训练 - - - - - - - 数据库实体父类 - - - - - 备注 - - - - - 创建人 - - - - - 创建时间 - - - - - 修改人 - - - - - 修改时间 - - - - - Name - - - - - Json - - - - - 学校编号 - - - - - 帐号 - - - - - 性别 - - - - - 头像 - - - - - 角色 - - - - - 角色 - - - - - 姓名 - - - - - 密码 - - - - - 手机号 - - - - - 是否可用 - - - - - 微信OpenId - - - - - 微信UnionId - - - - - 微信头像 - - - - - 微信昵称 - - - - - 地址 - - - - - Email - - - - - 账号关联Id - - - - - 出生日期 - - - - - 身高 - - - - - 体重 - - - - - 服务实现 - - - - - 构造 - - - - - - - 获取设备信息 - - - - - - - - 项目模式 - - - - - - 体育项目 - - 学校Id - - - - - 获取学生信息 - - 学校Id - - - - - 获取人脸信息 - - - - - - - 获取训练评分规则 - - 学校Id - - - - - 新增训练 - - - - - - - 服务接口 - - - - - 获取设备信息 - - - - - - - 项目模式 - - - - - - 体育项目 - - 学校Id - - - - - 获取学生信息 - - 学校Id - - - - - 获取人脸信息 - - - - - - - 获取训练评分规则 - - 学校Id - - - - - 新增训练 - - - - - - - 年级Id - - - - - 性别 - - - - - 类别枚举值 - - - - - 等级 - - - - - 得分 - - - - - 标准值(小) - - - - - 标准值(大) - - - - - 创建人 - - - - - 创建时间 - - - - - 修改人 - - - - - 修改时间 - - - - - 帐号 - - - - - - - - - - 性别 - - - - - 头像 - - - - - 不用 - - - - - 不用 - - - - - 角色 - - - - - 不用 - - - - - Token - - - - - 类型 - - - - - 姓名 - - - - - 学校编号 - - - - - 学校名称 - - - - - 密码 - - - - - 注册时间 - - - - - 手机号 - - - - - - - - - - 创建人 - - - - - 是否可用 - - - - - - - - - - 修改人 - - - - - 修改时间 - - - - - 审核时间 - - - - - 最后登陆时间 - - - - - 最后密码修改时间 - - - - - 地址 - - - - - Email - - - - - 备注 - - - - - 学校编号 - - - - - 年级Id - - - - - 年级名称 - - - - - 班级名称 - - - - - 学校编号 - - - - - 班级Id - - - - - 班级名称 - - - - - 学生学号 - - - - - 学籍号 - - - - - 地方学籍号 - - - - - 心率设备正面编号 - - - - - 心率设备ID - - - - - 心率设备二维码编号 - - - - - 跳绳编号 - - - - - 跳绳二维码编号 - - - - - 中长跑芯片编号 - - - - - 训练时长 - - - - - 训练次数 - - - - - 身份证 - - - - - 学生名族 - - - - - 学生名称 - - - - - 年龄 - - - - - 性别 - - - - - 学生照片 - - - - - 民族 - - - - - 家庭住址 - - - - - 状态 - - - - - 出生日期 - - - - - 家长姓名 - - - - - 家长联系方式 - - - - - 小程序密码 - - - - - 备注 - - - - - 创建人 - - - - - 创建时间 - - - - - 修改人 - - - - - 修改时间 - - - - - 芯未项目模式表 - - - - - Id - - - - - ProjectKind - - - - - 名称 - - - - - 芯未体测项目表 - - - - - Id - - - - - 学校Id - - - - - ProjectId - - - - - 名称 - - - - - IsOpen - - - - - IsShow - - - - - Swagger注释帮助类 - - - - - 添加附加注释 - - - - - - - 生成JWT - - - - - - - 解析 - - - - - - - 获取过期时间 - - - - - - - 为了尽量减少redis或Memory读取,保证执行效率,将UserContext注入到DI， - 每个UserContext的属性至多读取一次redis或Memory缓存从而提高查询效率 - - - - - http连接基础类，负责底层的http通信 - - - - - 处理http GET请求，返回数据 - - 请求的url地址 - http GET成功后返回的数据，失败抛WebException异常 - - - - 微信小程序从服务端获取的OpenId和SessionKey信息结构 - - - - - 微信小程序登录信息结构 - - - - - 微信小程序登录接口 - - - - - 构造函数 - - - - - - 获取OpenId和SessionKey的Json数据包 - - 客户端发来的code - Json数据包 - - - - 反序列化包含OpenId和SessionKey的Json数据包 - - Json数据包 - 包含OpenId和SessionKey的类 - - - - 根据微信小程序平台提供的解密算法解密数据，推荐直接使用此方法 - - 登陆信息 - 用户信息 - - - - 根据微信小程序平台提供的解密算法解密数据 - - 加密数据 - 初始向量 - 从服务端获取的SessionKey - - - - - 学校编号 - - - - - 年级名称 - - - - - 备注 - - - - - 创建人 - - - - - 创建时间 - - - - - 修改人 - - - - - 修改时间 - - - - - 学校性质Id - - - - - 学校编号 - - - - - 学校名称 - - - - - 所属省份 - - - - - 所属城市 - - - - - 所属区域 - - - - - 备注 - - - - - 创建人 - - - - - 创建时间 - - - - - 修改人 - - - - - 修改时间 - - - - - 设备表 - - - - - 编号 - - - - - 类型 (1 平板, 2 跳绳, ...) - - - - - 设备型号 - - - - - 设备序列号 - - - - - 设备 MAC 地址 - - - - - 设备 IMEI 地址 - - - - - AI 摄像机 IP 地址 (多个 IP 用 , 隔开) - - - - - 抢跑 IP (短跑) - - - - - 是否是 EAI100 摄像头 - - - - - 组织 ID - - - - - 组织名称 - - - - - 用户 ID - - - - - 用户名称 - - - - - 软件版本 - - - - - 硬件版本 - - - - - 应用时间 - - - - - 最后登录时间 - - - - - 备注 - - - - - 授权状态 (0 无效, 1 有效) - - - - - 状态 (0 无效, 1 有效) - - - - - 创建时间 - - - - - 创建人 - - - - - 修改时间 - - - - - 修改人 - - - - - 学校人脸的相似度 (80-99 之间的整数) - - - - - 摄像头序列号、版本信息 - - - - - 编号 - - - - - 考试id - - - - - 考试名称 - - - - - 项目类型(1体检 2体质) - - - - - 项目ID - - - - - 项目名称 - - - - - 模式类型(1随堂模式2名单模式3刷卡或手动录入) - - - - - 学校ID - - - - - 年级ID - - - - - 年级名称 - - - - - 班级或者名单id（根据roster_type来判断） - - - - - 班级名称 - - - - - 组别 - - - - - 老师ID - - - - - 老师名称 - - - - - 训练模式 - - - - - 评分标准类型(1国家标准2地方标准3自定义标准) - - - - - 项目类型(1跳绳2跑步) - - - - - 训练标准ID - - - - - 项目类型名称 - - - - - 评分标准类型名称 - - - - - 项目模式名称 - - - - - 训练人数 - - - - - 开始时间 - - - - - 结束时间 - - - - - 男生总数 - - - - - 女生总数 - - - - - 男生总成绩 - - - - - 男生最大值 - - - - - 男生最小值 - - - - - 女生总成绩 - - - - - 女生最大值 - - - - - 女生最小值 - - - - - 男生总分数 - - - - - 男生最大分数 - - - - - 男生最小分数 - - - - - 女生总分数 - - - - - 女生最大分数 - - - - - 女生最小分数 - - - - - 男生优秀人数 - - - - - 男生良好人数 - - - - - 男生及格人数 - - - - - 男生不及格人数 - - - - - 女生优秀人数 - - - - - 女生良好人数 - - - - - 女生及格人数 - - - - - 女生不及格人数 - - - - - 及格率 - - - - - 男生平均个数 - - - - - 女生平均个数 - - - - - 男生平均分数 - - - - - 女生平均分数 - - - - - 男生中位数 - - - - - 女生中位数 - - - - - 男生平均值 - - - - - 男生最大值 - - - - - 男生最小值 - - - - - 女生平均值 - - - - - 女生最大值 - - - - - 女生最小值 - - - - - 男生平均分数 - - - - - 男生最大分数 - - - - - 男生最小分数 - - - - - 女生平均分数 - - - - - 女生最大分数 - - - - - 女生最小分数 - - - - - 失误最少的同学次数 - - - - - 进入状态最快的同学耗时（心率借用这个字段。班级运动时间） - - - - - 第一名平均耗时 - - - - - 失误总次数 - - - - - 失误损失次数 - - - - - 甩绳速度偏慢损失次数 - - - - - 进入状态过慢损失次数 - - - - - 提交标识 - - - - - 创建时间 - - - - - 创建人 - - - - - 修改时间 - - - - - 修改人 - - - - - 是否双人模式 - - - - - 数据来源(1:pad, 2:微信小程序) - - - - - 学生姓名 - - - - - 学生列表 - - - - - 训练ID - - - - - 圈数 - - - - - 每圈时间间隔 - - - - - 首圈是否整圈(1-不完整，2-完整) - - - - - 首圈时间间隔 - - - - - 保留秒以下的小数位数（1：保留百分之一秒，0：保留十分之一秒） - - - - - 女生圈数 - - - - - 女生每圈时间间隔 - - - - - 女生首圈是否整圈(1-不完整，2-完整) - - - - - 女生首圈时间间隔 - - - - - 创建时间 - - - - - 创建人 - - - - - 编号 - - - - - 训练ID - - - - - 项目ID - - - - - 项目类型(1跳绳2跑步) - - - - - 学校ID - - - - - 年级ID - - - - - 年级名称 - - - - - 班级ID - - - - - 班级名称 - - - - - 组别 - - - - - 组号 - - - - - 老师ID - - - - - 设备ID - - - - - 学生ID - - - - - 学生名称 - - - - - 性别(1男2女) - - - - - 学号 - - - - - 标准成绩 - - - - - 原始标准成绩（被格式化小数点之前的） - - - - - 标准成绩2 - - - - - 原始标准成绩2（被格式化小数点之前的） - - - - - 得分 - - - - - 加分项得分 - - - - - 评分等级 - - - - - 男生或女生排名 - - - - - 全体排名 - - - - - 失误总次数 - - - - - 失误总耗时 - - - - - 平均耗时 - - - - - 有效平均值(中位数) - - - - - 失误损失次数 - - - - - 甩绳速度偏慢损失次数 - - - - - 进入状态过慢损失次数 - - - - - 高一档分数段 - - - - - 进入状态耗时 - - - - - 次数提升空间 - - - - - 分数提升空间 - - - - - 家长消息发送标识 - - - - - 是否已经完成 - - - - - 实际完成的数量（圈数 - - - - - 报表显示 - - - - - 开始时间 - - - - - 教师 - - - - - 创建时间 - - - - - 创建人 - - - - - 修改时间 - - - - - 修改人 - - - - diff --git a/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll b/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll deleted file mode 100644 index 1eccbb4..0000000 Binary files a/YD_XinWei/obj/Debug/net6.0/ref/YD_XinWei.Api.dll and /dev/null differ diff --git a/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll b/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll deleted file mode 100644 index 1eccbb4..0000000 Binary files a/YD_XinWei/obj/Debug/net6.0/refint/YD_XinWei.Api.dll and /dev/null differ diff --git a/YD_XinWei/obj/Debug/net6.0/staticwebassets.build.endpoints.json b/YD_XinWei/obj/Debug/net6.0/staticwebassets.build.endpoints.json deleted file mode 100644 index 2b6c535..0000000 --- a/YD_XinWei/obj/Debug/net6.0/staticwebassets.build.endpoints.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "Version": 1, - "ManifestType": "Build", - "Endpoints": [] -} \ No newline at end of file diff --git a/YD_XinWei/obj/Debug/net6.0/staticwebassets.build.json b/YD_XinWei/obj/Debug/net6.0/staticwebassets.build.json deleted file mode 100644 index d0431ea..0000000 --- a/YD_XinWei/obj/Debug/net6.0/staticwebassets.build.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "Version": 1, - "Hash": "KP759nLzKnXJ+WS979JyaVeurWoEX66xHrJc8V9vLq8=", - "Source": "YD_XinWei.Api", - "BasePath": "_content/YD_XinWei.Api", - "Mode": "Default", - "ManifestType": "Build", - "ReferencedProjectsConfiguration": [], - "DiscoveryPatterns": [], - "Assets": [], - "Endpoints": [] -} \ No newline at end of file diff --git a/YD_XinWei/obj/Debug/net6.0/staticwebassets/msbuild.build.YD_XinWei.Api.props b/YD_XinWei/obj/Debug/net6.0/staticwebassets/msbuild.build.YD_XinWei.Api.props deleted file mode 100644 index ddaed44..0000000 --- a/YD_XinWei/obj/Debug/net6.0/staticwebassets/msbuild.build.YD_XinWei.Api.props +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/YD_XinWei/obj/Debug/net6.0/staticwebassets/msbuild.buildMultiTargeting.YD_XinWei.Api.props b/YD_XinWei/obj/Debug/net6.0/staticwebassets/msbuild.buildMultiTargeting.YD_XinWei.Api.props deleted file mode 100644 index 6d7f888..0000000 --- a/YD_XinWei/obj/Debug/net6.0/staticwebassets/msbuild.buildMultiTargeting.YD_XinWei.Api.props +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/YD_XinWei/obj/Debug/net6.0/staticwebassets/msbuild.buildTransitive.YD_XinWei.Api.props b/YD_XinWei/obj/Debug/net6.0/staticwebassets/msbuild.buildTransitive.YD_XinWei.Api.props deleted file mode 100644 index 9838cda..0000000 --- a/YD_XinWei/obj/Debug/net6.0/staticwebassets/msbuild.buildTransitive.YD_XinWei.Api.props +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json b/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json index ec935d6..25465f5 100644 --- a/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json +++ b/YD_XinWei/obj/YD_XinWei.Api.csproj.nuget.dgspec.json @@ -151,6 +151,10 @@ "target": "Package", "version": "[10.0.0, )" }, + "CSRedisCore": { + "target": "Package", + "version": "[3.8.805, )" + }, "Microsoft.AspNetCore.Authentication.JwtBearer": { "target": "Package", "version": "[6.0.0, )" diff --git a/YD_XinWei/obj/project.assets.json b/YD_XinWei/obj/project.assets.json index 0c0c129..14be7b3 100644 --- a/YD_XinWei/obj/project.assets.json +++ b/YD_XinWei/obj/project.assets.json @@ -77,6 +77,23 @@ "lib/net6.0/AutoMapper.Collection.dll": {} } }, + "CSRedisCore/3.8.805": { + "type": "package", + "dependencies": { + "Newtonsoft.Json": "13.0.1", + "System.ValueTuple": "4.5.0" + }, + "compile": { + "lib/netstandard2.0/CSRedisCore.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/CSRedisCore.dll": { + "related": ".xml" + } + } + }, "Humanizer.Core/2.8.26": { "type": "package", "compile": { @@ -1158,6 +1175,15 @@ } } }, + "System.ValueTuple/4.5.0": { + "type": "package", + "compile": { + "ref/netcoreapp2.0/_._": {} + }, + "runtime": { + "lib/netcoreapp2.0/_._": {} + } + }, "System.Windows.Extensions/4.7.0": { "type": "package", "dependencies": { @@ -1288,6 +1314,23 @@ "lib/net6.0/AutoMapper.Collection.dll" ] }, + "CSRedisCore/3.8.805": { + "sha512": "H06j8J1qC+tuclDmPIE9qlVoXyrLJx9GDLLLScR3laCtloJG8jJMngUwKt4DDM584hyrWhGP1tbSLMIN6f9Veg==", + "type": "package", + "path": "csrediscore/3.8.805", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "csrediscore.3.8.805.nupkg.sha512", + "csrediscore.nuspec", + "lib/net40/CSRedisCore.dll", + "lib/net40/CSRedisCore.xml", + "lib/net45/CSRedisCore.dll", + "lib/net45/CSRedisCore.xml", + "lib/netstandard2.0/CSRedisCore.dll", + "lib/netstandard2.0/CSRedisCore.xml" + ] + }, "Humanizer.Core/2.8.26": { "sha512": "OiKusGL20vby4uDEswj2IgkdchC1yQ6rwbIkZDVBPIR6al2b7n3pC91elBul9q33KaBgRKhbZH3+2Ur4fnWx2A==", "type": "package", @@ -3112,6 +3155,50 @@ "version.txt" ] }, + "System.ValueTuple/4.5.0": { + "sha512": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==", + "type": "package", + "path": "system.valuetuple/4.5.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "lib/MonoAndroid10/_._", + "lib/MonoTouch10/_._", + "lib/net461/System.ValueTuple.dll", + "lib/net461/System.ValueTuple.xml", + "lib/net47/System.ValueTuple.dll", + "lib/net47/System.ValueTuple.xml", + "lib/netcoreapp2.0/_._", + "lib/netstandard1.0/System.ValueTuple.dll", + "lib/netstandard1.0/System.ValueTuple.xml", + "lib/netstandard2.0/_._", + "lib/portable-net40+sl4+win8+wp8/System.ValueTuple.dll", + "lib/portable-net40+sl4+win8+wp8/System.ValueTuple.xml", + "lib/uap10.0.16299/_._", + "lib/xamarinios10/_._", + "lib/xamarinmac20/_._", + "lib/xamarintvos10/_._", + "lib/xamarinwatchos10/_._", + "ref/MonoAndroid10/_._", + "ref/MonoTouch10/_._", + "ref/net461/System.ValueTuple.dll", + "ref/net47/System.ValueTuple.dll", + "ref/netcoreapp2.0/_._", + "ref/netstandard2.0/_._", + "ref/portable-net40+sl4+win8+wp8/System.ValueTuple.dll", + "ref/uap10.0.16299/_._", + "ref/xamarinios10/_._", + "ref/xamarinmac20/_._", + "ref/xamarintvos10/_._", + "ref/xamarinwatchos10/_._", + "system.valuetuple.4.5.0.nupkg.sha512", + "system.valuetuple.nuspec", + "useSharedDesignerContext.txt", + "version.txt" + ] + }, "System.Windows.Extensions/4.7.0": { "sha512": "CeWTdRNfRaSh0pm2gDTJFwVaXfTq6Xwv/sA887iwPTneW7oMtMlpvDIO+U60+3GWTB7Aom6oQwv5VZVUhQRdPQ==", "type": "package", @@ -3143,6 +3230,7 @@ "net6.0": [ "AutoMapper.Collection >= 10.0.0", "Autofac.Extensions.DependencyInjection >= 10.0.0", + "CSRedisCore >= 3.8.805", "Microsoft.AspNetCore.Authentication.JwtBearer >= 6.0.0", "Microsoft.AspNetCore.Mvc.NewtonsoftJson >= 6.0.0", "Microsoft.AspNetCore.Mvc.Versioning >= 5.1.0", @@ -3218,6 +3306,10 @@ "target": "Package", "version": "[10.0.0, )" }, + "CSRedisCore": { + "target": "Package", + "version": "[3.8.805, )" + }, "Microsoft.AspNetCore.Authentication.JwtBearer": { "target": "Package", "version": "[6.0.0, )" diff --git a/YD_XinWei/obj/project.nuget.cache b/YD_XinWei/obj/project.nuget.cache index a56c6da..52842ca 100644 --- a/YD_XinWei/obj/project.nuget.cache +++ b/YD_XinWei/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "ZbgajAk+GL8=", + "dgSpecHash": "cMv0KXgQ/n4=", "success": true, "projectFilePath": "C:\\Users\\tangl\\Desktop\\Git\\YD_XinWei\\YD_XinWei\\YD_XinWei.Api.csproj", "expectedPackageFiles": [ @@ -9,6 +9,7 @@ "C:\\Users\\tangl\\.nuget\\packages\\autofac.extensions.dependencyinjection\\10.0.0\\autofac.extensions.dependencyinjection.10.0.0.nupkg.sha512", "C:\\Users\\tangl\\.nuget\\packages\\automapper\\13.0.0\\automapper.13.0.0.nupkg.sha512", "C:\\Users\\tangl\\.nuget\\packages\\automapper.collection\\10.0.0\\automapper.collection.10.0.0.nupkg.sha512", + "C:\\Users\\tangl\\.nuget\\packages\\csrediscore\\3.8.805\\csrediscore.3.8.805.nupkg.sha512", "C:\\Users\\tangl\\.nuget\\packages\\humanizer.core\\2.8.26\\humanizer.core.2.8.26.nupkg.sha512", "C:\\Users\\tangl\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\6.0.0\\microsoft.aspnetcore.authentication.jwtbearer.6.0.0.nupkg.sha512", "C:\\Users\\tangl\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512", @@ -72,6 +73,7 @@ "C:\\Users\\tangl\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512", "C:\\Users\\tangl\\.nuget\\packages\\system.text.encoding.codepages\\4.7.0\\system.text.encoding.codepages.4.7.0.nupkg.sha512", "C:\\Users\\tangl\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512", + "C:\\Users\\tangl\\.nuget\\packages\\system.valuetuple\\4.5.0\\system.valuetuple.4.5.0.nupkg.sha512", "C:\\Users\\tangl\\.nuget\\packages\\system.windows.extensions\\4.7.0\\system.windows.extensions.4.7.0.nupkg.sha512" ], "logs": []