diff --git a/Snblog.IService/IService/IArticleTagService.cs b/Snblog.IService/IService/IArticleTagService.cs index 821f7bf565816e1ceb5d66c06eb53ca7dd82e9af..2f8108764f884a367a67552bc0f113a440b5a236 100644 --- a/Snblog.IService/IService/IArticleTagService.cs +++ b/Snblog.IService/IService/IArticleTagService.cs @@ -1,4 +1,4 @@ -namespace Snblog.IService +namespace Snblog.IService.IService { /// /// 文章标签接口 diff --git a/Snblog.IService/IService/IArticleTypeService.cs b/Snblog.IService/IService/IArticleTypeService.cs index 380f5a96fa803ad571047da66603bfb22cb132b0..e99c6e94cdc05fe1ce2efce2c9926deb96f6f0d8 100644 --- a/Snblog.IService/IService/IArticleTypeService.cs +++ b/Snblog.IService/IService/IArticleTypeService.cs @@ -1,4 +1,4 @@ -namespace Snblog.IService +namespace Snblog.IService.IService { /// /// 文章分类接口 diff --git a/Snblog.IService/IService/ISnTalkTypeService.cs b/Snblog.IService/IService/ISnTalkTypeService.cs index 6d020d79120979ac1bad9f0f7e67d7d5644e9038..f7ccce9bbedb8c09e84854b30d47c5d2ad8c6a75 100644 --- a/Snblog.IService/IService/ISnTalkTypeService.cs +++ b/Snblog.IService/IService/ISnTalkTypeService.cs @@ -1,5 +1,5 @@  -namespace Snblog.IService +namespace Snblog.IService.IService { public interface ISnTalkTypeService { diff --git a/Snblog.IService/IService/ISnUserTalkService.cs b/Snblog.IService/IService/ISnUserTalkService.cs index 21da06faf60279f34914d543c268079d6f79ed86..32d8d8e2e399129a54ded8fc9c9022569aef7255 100644 --- a/Snblog.IService/IService/ISnUserTalkService.cs +++ b/Snblog.IService/IService/ISnUserTalkService.cs @@ -1,4 +1,4 @@ -namespace Snblog.IService +namespace Snblog.IService.IService { /// /// 业务类接口 diff --git a/Snblog.IService/IService/ISnVideoTypeService.cs b/Snblog.IService/IService/ISnVideoTypeService.cs index c150a52e5159ceb199f99c3a3c9c721e3a39d8c6..ddb9ef930ddede82b62183a3dbf475f779905b9f 100644 --- a/Snblog.IService/IService/ISnVideoTypeService.cs +++ b/Snblog.IService/IService/ISnVideoTypeService.cs @@ -1,4 +1,4 @@ -namespace Snblog.IService +namespace Snblog.IService.IService { public interface ISnVideoTypeService { diff --git a/Snblog.IService/IService/ISnippetLabelService.cs b/Snblog.IService/IService/ISnippetLabelService.cs index 54897d080c3785e8009acd38da38c707b5b61825..413dc63b643e41367bcc6f25fdc57b837899dad1 100644 --- a/Snblog.IService/IService/ISnippetLabelService.cs +++ b/Snblog.IService/IService/ISnippetLabelService.cs @@ -1,4 +1,4 @@ -namespace Snblog.IService +namespace Snblog.IService.IService { public interface ISnippetLabelService { diff --git a/Snblog.IService/IService/ISnippetTagService.cs b/Snblog.IService/IService/ISnippetTagService.cs index 450408384a4dba4cff002abc0a5bb2a33e12262a..3c51b279b6d1e2d07b804fb7edb5bc3c80ef12e6 100644 --- a/Snblog.IService/IService/ISnippetTagService.cs +++ b/Snblog.IService/IService/ISnippetTagService.cs @@ -1,4 +1,4 @@ -namespace Snblog.IService +namespace Snblog.IService.IService { public interface ISnippetTagService { diff --git a/Snblog.IService/IService/ISnippetTypeService.cs b/Snblog.IService/IService/ISnippetTypeService.cs index eb92b834d1f1873ad10eb3b52e3f1534def7f48c..461b0fb1b35c5642ad348e7b370ef880987f89b0 100644 --- a/Snblog.IService/IService/ISnippetTypeService.cs +++ b/Snblog.IService/IService/ISnippetTypeService.cs @@ -1,4 +1,4 @@ -namespace Snblog.IService +namespace Snblog.IService.IService { public interface ISnippetTypeService { diff --git a/Snblog.IService/IService/IUserService.cs b/Snblog.IService/IService/IUserService.cs index 3eb745312e29227f35d3f0ce456b3c65be972f86..ab470bfa1e422cf9c691b0bea250cbb70fcdf00d 100644 --- a/Snblog.IService/IService/IUserService.cs +++ b/Snblog.IService/IService/IUserService.cs @@ -1,4 +1,4 @@ -namespace Snblog.IService +namespace Snblog.IService.IService { public interface IUserService { diff --git a/Snblog.IService/IService/IVideoService.cs b/Snblog.IService/IService/IVideoService.cs index 74d5ace50e2517aacf680df3e6b4968516e3b0a3..c438c8ce690f85c9dfd644989fbd359b3cd75651 100644 --- a/Snblog.IService/IService/IVideoService.cs +++ b/Snblog.IService/IService/IVideoService.cs @@ -1,4 +1,4 @@ -namespace Snblog.IService +namespace Snblog.IService.IService { public interface IVideoService { diff --git a/Snblog.Service/BaseService.cs b/Snblog.Service/BaseService.cs index 90bdd3365a34a061bb654a7a21b1eaf96475de3b..9a31926c20b56fb5a44dc0939b2960a04fec62d9 100644 --- a/Snblog.Service/BaseService.cs +++ b/Snblog.Service/BaseService.cs @@ -5,17 +5,17 @@ namespace Snblog.Service public class BaseService : IBaseService { private readonly IRepositoryFactory _repositoryFactory; - private readonly IConcardContext _mydbcontext; + private readonly IConcardContext _myDbcontext; - protected BaseService(IRepositoryFactory repositoryFactory, IConcardContext mydbcontext) + protected BaseService(IRepositoryFactory repositoryFactory, IConcardContext myDbcontext) { _repositoryFactory = repositoryFactory; - _mydbcontext = mydbcontext; + _myDbcontext = myDbcontext; } public IRepositorys CreateService() where T : class, new() { - return _repositoryFactory.CreateRepository(_mydbcontext); + return _repositoryFactory.CreateRepository(_myDbcontext); } } } diff --git a/Snblog.Service/ReService/ReSnArticleService.cs b/Snblog.Service/ReService/ReSnArticleService.cs index 46b17774cf68e386de8fb4a095a99ca64d725f8a..b8ae27223d1a575211725cf89d7e03eb3c247632 100644 --- a/Snblog.Service/ReService/ReSnArticleService.cs +++ b/Snblog.Service/ReService/ReSnArticleService.cs @@ -4,70 +4,70 @@ namespace Snblog.Service.ReService { public class ReSnArticleService : BaseService, IReSnArticleService { - private readonly CacheUtil _cacheutil; - private int result_Int; - private List
result_List = null; + private readonly CacheUtil _cache; + private int _resultInt; + private List
_resultList; - public ReSnArticleService(ICacheUtil cacheUtil, IRepositoryFactory repositoryFactory, IConcardContext mydbcontext) : base(repositoryFactory, mydbcontext) + public ReSnArticleService(ICacheUtil cacheUtil, IRepositoryFactory repositoryFactory, IConcardContext myDbcontext) : base(repositoryFactory, myDbcontext) { - _cacheutil = (CacheUtil)cacheUtil; + _cache = (CacheUtil)cacheUtil; } public async Task CountAsync() { - result_Int = _cacheutil.CacheNumber1("CountAsync", result_Int); - if (result_Int == 0) + _resultInt = _cache.CacheNumber1("CountAsync", _resultInt); + if (_resultInt == 0) { - result_Int = await CreateService
().CountAsync(); - _cacheutil.CacheNumber1("CountAsync", result_Int); + _resultInt = await CreateService
().CountAsync(); + _cache.CacheNumber1("CountAsync", _resultInt); } - return result_Int; + return _resultInt; } public async Task CountAsync(int type) { //读取缓存值 - result_Int = _cacheutil.CacheNumber1("CountAsync" + type, result_Int); - if (result_Int == 0) + _resultInt = _cache.CacheNumber1("CountAsync" + type, _resultInt); + if (_resultInt == 0) { - result_Int = await CreateService
().CountAsync(c => c.TypeId == type);//获取数据值 - _cacheutil.CacheNumber1("CountAsync" + type, result_Int);//设置缓存值 + _resultInt = await CreateService
().CountAsync(c => c.TypeId == type);//获取数据值 + _cache.CacheNumber1("CountAsync" + type, _resultInt);//设置缓存值 } - return result_Int; + return _resultInt; } public async Task> GetAllAsync() { - result_List = _cacheutil.CacheString1("GetAllSnArticleAsync", result_List); - if (result_List == null) + _resultList = _cache.CacheString1("GetAllSnArticleAsync", _resultList); + if (_resultList == null) { - result_List = await CreateService
().GetAllAsync(); - _cacheutil.CacheString1("GetAllSnArticleAsync", result_List); + _resultList = await CreateService
().GetAllAsync(); + _cache.CacheString1("GetAllSnArticleAsync", _resultList); } - return result_List; + return _resultList; } public async Task
GetByIdAsync(int id) { Article result = null; - result = _cacheutil.CacheString1("GetByIdAsync" + id, result); + result = _cache.CacheString1("GetByIdAsync" + id, result); if (result == null) { result = await CreateService
().GetByIdAsync(id); - _cacheutil.CacheString1("GetByIdAsync" + id, result); + _cache.CacheString1("GetByIdAsync" + id, result); } return result; } public async Task> GetFyTitleAsync(int pageIndex, int pageSize, bool isDesc) { - result_List = _cacheutil.CacheString1("ReGetFyTitleAsync" + pageIndex + pageSize + isDesc, result_List); //设置缓存 - if (result_List == null) + _resultList = _cache.CacheString1("ReGetFyTitleAsync" + pageIndex + pageSize + isDesc, _resultList); //设置缓存 + if (_resultList == null) { - result_List = await GetFyTitle(pageIndex, pageSize, isDesc); //读取数据 - _cacheutil.CacheString1("ReGetFyTitleAsync" + pageIndex + pageSize + isDesc, result_List); //设置缓存 + _resultList = await GetFyTitle(pageIndex, pageSize, isDesc); //读取数据 + _cache.CacheString1("ReGetFyTitleAsync" + pageIndex + pageSize + isDesc, _resultList); //设置缓存 } - return result_List; + return _resultList; } /// @@ -112,24 +112,24 @@ namespace Snblog.Service.ReService public async Task> GetLabelAllAsync(int id) { - result_List = _cacheutil.CacheString1("GetLabelAllAsync" + id, result_List); - if (result_List == null) + _resultList = _cache.CacheString1("GetLabelAllAsync" + id, _resultList); + if (_resultList == null) { - result_List = await CreateService
().Where(s => s.TypeId == id).ToListAsync(); - _cacheutil.CacheString1("GetLabelAllAsync" + id, result_List); + _resultList = await CreateService
().Where(s => s.TypeId == id).ToListAsync(); + _cache.CacheString1("GetLabelAllAsync" + id, _resultList); } - return result_List; + return _resultList; } public async Task GetSumAsync(string type) { - result_Int = _cacheutil.CacheNumber1("ReGetSumAsync" + type, result_Int); - if (result_Int == 0) + _resultInt = _cache.CacheNumber1("ReGetSumAsync" + type, _resultInt); + if (_resultInt == 0) { - result_Int = await GetSum(type); - _cacheutil.CacheNumber1("ReGetSumAsync" + type, result_Int); + _resultInt = await GetSum(type); + _cache.CacheNumber1("ReGetSumAsync" + type, _resultInt); } - return result_Int; + return _resultInt; } /// @@ -173,13 +173,13 @@ namespace Snblog.Service.ReService public async Task> GetTypeFyTextAsync(int type, int pageIndex, int pageSize, bool isDesc) { - result_List = _cacheutil.CacheString1("ReGetTypeFyTextAsync" + type + pageIndex + isDesc, result_List); - if (result_List == null) + _resultList = _cache.CacheString1("ReGetTypeFyTextAsync" + type + pageIndex + isDesc, _resultList); + if (_resultList == null) { - result_List = await GetTypeFy(type, pageIndex, pageSize, isDesc); - _cacheutil.CacheString1("ReGetTypeFyTextAsync" + type + pageIndex + isDesc, result_List); + _resultList = await GetTypeFy(type, pageIndex, pageSize, isDesc); + _cache.CacheString1("ReGetTypeFyTextAsync" + type + pageIndex + isDesc, _resultList); } - return result_List; + return _resultList; } @@ -199,13 +199,13 @@ namespace Snblog.Service.ReService public async Task> GetFyTypeorderAsync(int type, int pageIndex, int pageSize, string order, bool isDesc) { - result_List = _cacheutil.CacheString1("ReGetFyTypeorderAsync" + type + pageIndex + pageSize + order + isDesc, result_List); - if (result_List == null) + _resultList = _cache.CacheString1("ReGetFyTypeorderAsync" + type + pageIndex + pageSize + order + isDesc, _resultList); + if (_resultList == null) { - result_List = await GetFyTypeorder(type, pageIndex, pageSize, order, isDesc); - _cacheutil.CacheString1("ReGetFyTypeorderAsync" + type + pageIndex + pageSize + order + isDesc, result_List); + _resultList = await GetFyTypeorder(type, pageIndex, pageSize, order, isDesc); + _cache.CacheString1("ReGetFyTypeorderAsync" + type + pageIndex + pageSize + order + isDesc, _resultList); } - return result_List; + return _resultList; } @@ -241,13 +241,13 @@ namespace Snblog.Service.ReService public async Task> GetTagIdAsync(int tag, bool isDesc) { - result_List = _cacheutil.CacheString1("ReGetTagtextAsync" + tag + isDesc, result_List); //设置缓存 - if (result_List == null) + _resultList = _cache.CacheString1("ReGetTagtextAsync" + tag + isDesc, _resultList); //设置缓存 + if (_resultList == null) { - result_List = await GetTagtext(tag, isDesc); //读取数据 - _cacheutil.CacheString1("ReGetTagtextAsync" + tag + isDesc, result_List); //设置缓存 + _resultList = await GetTagtext(tag, isDesc); //读取数据 + _cache.CacheString1("ReGetTagtextAsync" + tag + isDesc, _resultList); //设置缓存 } - return result_List; + return _resultList; } private async Task> GetTagtext(int tag, bool isDesc) diff --git a/Snblog.Service/ReService/ReSnNavigationService.cs b/Snblog.Service/ReService/ReSnNavigationService.cs index 4739edd87dfe79e8cec201faa0882c1ffb400ce0..c6626760360d18df4c39c6a02e1baa99a59d4d48 100644 --- a/Snblog.Service/ReService/ReSnNavigationService.cs +++ b/Snblog.Service/ReService/ReSnNavigationService.cs @@ -4,24 +4,24 @@ namespace Snblog.Service.ReService { public class ReSnNavigationService : BaseService, IReSnNavigationService { - private readonly CacheUtil _cacheutil; - private int result_Int; - private List result_List = null; - private SnNavigation result_Model = null; - public ReSnNavigationService(IRepositoryFactory repositoryFactory, IConcardContext mydbcontext, ICacheUtil cacheutil) : base(repositoryFactory, mydbcontext) + private readonly CacheUtil _cache; + private int _resultInt; + private List _resultList = null; + private SnNavigation _resultModel = null; + public ReSnNavigationService(IRepositoryFactory repositoryFactory, IConcardContext mydbcontext, ICacheUtil cache) : base(repositoryFactory, mydbcontext) { - _cacheutil = (CacheUtil)cacheutil; + _cache = (CacheUtil)cache; } public async Task> GetAllAsync() { - result_List = _cacheutil.CacheString1("ReGetAllAsync", result_List); - if (result_List == null) + _resultList = _cache.CacheString1("ReGetAllAsync", _resultList); + if (_resultList == null) { - result_List = await CreateService().GetAllAsync(); - _cacheutil.CacheString1("ReGetAllAsync", result_List); + _resultList = await CreateService().GetAllAsync(); + _cache.CacheString1("ReGetAllAsync", _resultList); } - return result_List; + return _resultList; } /// @@ -31,13 +31,13 @@ namespace Snblog.Service.ReService /// public async Task GetByIdAsync(int id) { - result_Model = _cacheutil.CacheString1("ReGetByIdAsync" + id, result_Model); - if (result_Model == null) + _resultModel = _cache.CacheString1("ReGetByIdAsync" + id, _resultModel); + if (_resultModel == null) { - result_Model = await CreateService().GetByIdAsync(id); - _cacheutil.CacheString1("ReGetByIdAsync" + id, result_Model); + _resultModel = await CreateService().GetByIdAsync(id); + _cache.CacheString1("ReGetByIdAsync" + id, _resultModel); } - return result_Model; + return _resultModel; } /// @@ -46,13 +46,13 @@ namespace Snblog.Service.ReService /// public async Task GetCountAsync() { - result_Int = _cacheutil.CacheNumber1("ReGetCountAsync", result_Int); - if (result_Int == 0) + _resultInt = _cache.CacheNumber1("ReGetCountAsync", _resultInt); + if (_resultInt == 0) { - result_Int = await CreateService().CountAsync(); - _cacheutil.CacheNumber1("ReGetCountAsync", result_Int); + _resultInt = await CreateService().CountAsync(); + _cache.CacheNumber1("ReGetCountAsync", _resultInt); } - return result_Int; + return _resultInt; } /// @@ -62,13 +62,13 @@ namespace Snblog.Service.ReService /// public async Task CountTypeAsync(string type) { - result_Int = _cacheutil.CacheNumber1("ReCountTypeAsync", result_Int); - if (result_Int == 0) + _resultInt = _cache.CacheNumber1("ReCountTypeAsync", _resultInt); + if (_resultInt == 0) { - result_Int = await CreateService().CountAsync(c => c.Type.Title == type); - _cacheutil.CacheNumber1("ReCountTypeAsync", result_Int); + _resultInt = await CreateService().CountAsync(c => c.Type.Title == type); + _cache.CacheNumber1("ReCountTypeAsync", _resultInt); } - return result_Int; + return _resultInt; } /// @@ -78,13 +78,13 @@ namespace Snblog.Service.ReService /// public async Task> GetDistinct(string type) { - result_List = _cacheutil.CacheString1("ReGetDistinct" + type, result_List); - if (result_List == null) + _resultList = _cache.CacheString1("ReGetDistinct" + type, _resultList); + if (_resultList == null) { - result_List = await CreateService().Distinct(s => s.Type.Title == type).ToListAsync(); - _cacheutil.CacheString1("ReGetDistinct" + type, result_List); + _resultList = await CreateService().Distinct(s => s.Type.Title == type).ToListAsync(); + _cache.CacheString1("ReGetDistinct" + type, _resultList); } - return result_List; + return _resultList; } @@ -96,13 +96,13 @@ namespace Snblog.Service.ReService /// List public async Task> GetTypeOrderAsync(string type, bool order) { - result_List = _cacheutil.CacheString1("ReGetTypeOrderAsync" + type + order, result_List); - if (result_List == null) + _resultList = _cache.CacheString1("ReGetTypeOrderAsync" + type + order, _resultList); + if (_resultList == null) { - result_List = await CreateService().Where(c => c.Type.Title == type, s => s.Id, order).ToListAsync(); - _cacheutil.CacheString1("ReGetTypeOrderAsync" + type + order, result_List); + _resultList = await CreateService().Where(c => c.Type.Title == type, s => s.Id, order).ToListAsync(); + _cache.CacheString1("ReGetTypeOrderAsync" + type + order, _resultList); } - return result_List; + return _resultList; } @@ -115,13 +115,13 @@ namespace Snblog.Service.ReService /// 是否倒序 public async Task> GetFyAllAsync(string type, int pageIndex, int pageSize, bool isDesc) { - result_List = _cacheutil.CacheString1("ReGetFyAllAsync" + type + pageIndex + pageSize + isDesc, result_List); - if (result_List == null) + _resultList = _cache.CacheString1("ReGetFyAllAsync" + type + pageIndex + pageSize + isDesc, _resultList); + if (_resultList == null) { - result_List= await FyAll(type, pageIndex, pageSize, isDesc); - _cacheutil.CacheString1("ReGetFyAllAsync" + type + pageIndex + pageSize + isDesc ,result_List); + _resultList= await FyAll(type, pageIndex, pageSize, isDesc); + _cache.CacheString1("ReGetFyAllAsync" + type + pageIndex + pageSize + isDesc ,_resultList); } - return result_List; + return _resultList; } /// diff --git a/Snblog.Service/Service/ArticleService.cs b/Snblog.Service/Service/ArticleService.cs index 7da094153ffc90d9585001bf0ef0addabaa2d237..e92ab0271c92250a309518e62782297df330e865 100644 --- a/Snblog.Service/Service/ArticleService.cs +++ b/Snblog.Service/Service/ArticleService.cs @@ -8,9 +8,9 @@ /// /// 缓存Key /// - private string cacheKey; - private readonly EntityData
res = new(); - private readonly EntityDataDto resDto = new(); + private string _cacheKey; + private readonly EntityData
_res = new(); + private readonly EntityDataDto _resDto = new(); //服务 private readonly snblogContext _service; @@ -31,8 +31,8 @@ public async Task DelAsync(int id) { - cacheKey = $"{NAME}{ConstantString.DEL}{id}"; - Log.Information(cacheKey); + _cacheKey = $"{NAME}{ConstantString.DEL}{id}"; + Log.Information(_cacheKey); Article result = await _service.Articles.FindAsync(id); @@ -45,45 +45,45 @@ } public async Task GetByIdAsync(int id,bool cache) { - cacheKey = $"{NAME}{ConstantString.BYID}{id}_{cache}"; - Log.Information(cacheKey); + _cacheKey = $"{NAME}{ConstantString.BYID}{id}_{cache}"; + Log.Information(_cacheKey); if (cache) { - resDto.Entity = _cache.GetValue(cacheKey,resDto.Entity); - if (resDto.Entity != null) return resDto.Entity; + _resDto.Entity = _cache.GetValue(_cacheKey,_resDto.Entity); + if (_resDto.Entity != null) return _resDto.Entity; } - resDto.Entity = await _service.Articles + _resDto.Entity = await _service.Articles .SelectArticle() .SingleOrDefaultAsync(b => b.Id == id); - _cache.SetValue(cacheKey,resDto.Entity); - return resDto.Entity; + _cache.SetValue(_cacheKey,_resDto.Entity); + return _resDto.Entity; } public async Task> GetTypeAsync(int identity,string type,bool cache) { - cacheKey = $"{NAME}{identity}_{type}_{cache}"; - Log.Information(cacheKey); + _cacheKey = $"{NAME}{identity}_{type}_{cache}"; + Log.Information(_cacheKey); if (cache) { - resDto.EntityList = _cache.GetValue(cacheKey,resDto.EntityList); - if (resDto.EntityList != null) { - return resDto.EntityList; + _resDto.EntityList = _cache.GetValue(_cacheKey,_resDto.EntityList); + if (_resDto.EntityList != null) { + return _resDto.EntityList; } } if (identity == 1) { //分类 - resDto.EntityList = await _service.Articles + _resDto.EntityList = await _service.Articles .SelectArticle() .Where(s => s.Type.Name == type) .ToListAsync(); } else { //2 标签 - resDto.EntityList = await _service.Articles + _resDto.EntityList = await _service.Articles .SelectArticle() .Where(s => s.Tag.Name == type) .ToListAsync(); } - _cache.SetValue(cacheKey,resDto.EntityList); - return resDto.EntityList; + _cache.SetValue(_cacheKey,_resDto.EntityList); + return _resDto.EntityList; } public async Task AddAsync(Article entity) @@ -126,11 +126,11 @@ public async Task GetSumAsync(int identity,string type,bool cache) { - cacheKey = $"{NAME}{ConstantString.SUM}{identity}_{type}_{cache}"; - Log.Information(cacheKey); + _cacheKey = $"{NAME}{ConstantString.SUM}{identity}_{type}_{cache}"; + Log.Information(_cacheKey); if (cache) { - int sum = _cache.GetValue(cacheKey,0); + int sum = _cache.GetValue(_cacheKey,0); if (sum != 0) { //通过entityInt 值是否为 0 判断结果是否被缓存 return sum; } @@ -160,7 +160,7 @@ try { int count = await query.CountAsync(); - _cache.SetValue(cacheKey,count); //设置缓存 + _cache.SetValue(_cacheKey,count); //设置缓存 return count; } catch { return -1; @@ -169,15 +169,15 @@ public async Task> GetAllAsync(bool cache) { - cacheKey = $"{NAME}{ConstantString.ALL}{cache}"; - Log.Information(cacheKey); + _cacheKey = $"{NAME}{ConstantString.ALL}{cache}"; + Log.Information(_cacheKey); if (cache) { - resDto.EntityList = _cache.GetValue(cacheKey,resDto.EntityList); - if (resDto.EntityList != null) return resDto.EntityList; + _resDto.EntityList = _cache.GetValue(_cacheKey,_resDto.EntityList); + if (_resDto.EntityList != null) return _resDto.EntityList; } var data = await _service.Articles.SelectArticle().ToListAsync(); - _cache.SetValue(cacheKey,resDto.EntityList); + _cache.SetValue(_cacheKey,_resDto.EntityList); return data; } @@ -191,32 +191,32 @@ /// int public async Task GetStrSumAsync(int identity,int type,string name,bool cache) { - cacheKey = $"{NAME}统计{identity}_{type}_{name}_{cache}"; - Log.Information(cacheKey); + _cacheKey = $"{NAME}统计{identity}_{type}_{name}_{cache}"; + Log.Information(_cacheKey); if (cache) { - res.EntityCount = _cache.GetValue(cacheKey,res.EntityCount); - if (res.EntityCount != 0) { - return res.EntityCount; + _res.EntityCount = _cache.GetValue(_cacheKey,_res.EntityCount); + if (_res.EntityCount != 0) { + return _res.EntityCount; } } switch (identity) { case 0: - res.EntityCount = await GetStatistic(type); + _res.EntityCount = await GetStatistic(type); break; case 1: - res.EntityCount = await GetStatistic(type,c => c.Type.Name == name); + _res.EntityCount = await GetStatistic(type,c => c.Type.Name == name); break; case 2: - res.EntityCount = await GetStatistic(type,c => c.Tag.Name == name); + _res.EntityCount = await GetStatistic(type,c => c.Tag.Name == name); break; case 3: - res.EntityCount = await GetStatistic(type,c => c.User.Name == name); + _res.EntityCount = await GetStatistic(type,c => c.User.Name == name); break; } - _cache.SetValue(cacheKey,res.EntityCount); - return res.EntityCount; + _cache.SetValue(_cacheKey,_res.EntityCount); + return _res.EntityCount; } /// @@ -252,13 +252,13 @@ /// 排序规则 data:时间|read:阅读|give:点赞|id:主键 public async Task> GetPagingAsync(int identity,string type,int pageIndex,int pageSize,string ordering,bool isDesc,bool cache) { - cacheKey = $"{NAME}{ConstantString.PAGING}{identity}_{type}_{pageIndex}_{pageSize}_{ordering}_{isDesc}_{cache}"; - Log.Information(cacheKey); + _cacheKey = $"{NAME}{ConstantString.PAGING}{identity}_{type}_{pageIndex}_{pageSize}_{ordering}_{isDesc}_{cache}"; + Log.Information(_cacheKey); if (cache) { - resDto.EntityList = _cache.GetValue(cacheKey,resDto.EntityList); - if (resDto.EntityList != null) { - return resDto.EntityList; + _resDto.EntityList = _cache.GetValue(_cacheKey,_resDto.EntityList); + if (_resDto.EntityList != null) { + return _resDto.EntityList; } } switch (identity) { @@ -271,9 +271,9 @@ case 3: return await GetArticlePaging(pageIndex,pageSize,ordering,isDesc,w => w.User.Name == type); case 4: - resDto.Name = type.Split(','); - return await GetArticlePaging(pageIndex,pageSize,ordering,isDesc,w => w.Tag.Name == resDto.Name[0] - && w.User.Name == resDto.Name[1]); + _resDto.Name = type.Split(','); + return await GetArticlePaging(pageIndex,pageSize,ordering,isDesc,w => w.Tag.Name == _resDto.Name[0] + && w.User.Name == _resDto.Name[1]); default: return await GetArticlePaging(pageIndex,pageSize,ordering,isDesc); } @@ -302,7 +302,7 @@ } var data = await articles.Skip(( pageIndex - 1 ) * pageSize).Take(pageSize) .SelectArticle().ToListAsync(); - _cache.SetValue(cacheKey,resDto.EntityList); + _cache.SetValue(_cacheKey,_resDto.EntityList); return data; } @@ -336,13 +336,13 @@ public async Task> GetContainsAsync(int identity,string type,string name,bool cache) { var upNames = name.ToUpper(); - cacheKey = $"{NAME}{ConstantString.CONTAINS}{identity}_{type}_{name}_{cache}"; - Log.Information(cacheKey); + _cacheKey = $"{NAME}{ConstantString.CONTAINS}{identity}_{type}_{name}_{cache}"; + Log.Information(_cacheKey); if (cache) { - resDto.EntityList = _cache.GetValue(cacheKey,resDto.EntityList); - if (resDto.EntityList != null) { - return resDto.EntityList; + _resDto.EntityList = _cache.GetValue(_cacheKey,_resDto.EntityList); + if (_resDto.EntityList != null) { + return _resDto.EntityList; } } @@ -360,11 +360,14 @@ /// 筛选文章的条件 private async Task> GetArticleContainsAsync(Expression> predicate = null) { - if (predicate != null) { - resDto.EntityList = await _service.Articles.Where(predicate).SelectArticle().ToListAsync(); - _cache.SetValue(cacheKey,resDto.EntityList); //设置缓存 + if (predicate == null) + { + return _resDto.EntityList; } - return resDto.EntityList; + + _resDto.EntityList = await _service.Articles.Where(predicate).SelectArticle().ToListAsync(); + _cache.SetValue(_cacheKey,_resDto.EntityList); //设置缓存 + return _resDto.EntityList; } } diff --git a/Snblog/Controllers/SnPictureTypeController.cs b/Snblog/Controllers/SnPictureTypeController.cs index 7c74d8f838547b031054e040f6425419aa9417c9..d3a045968e30176f2e16eb7ef8d38ffd445caf33 100644 --- a/Snblog/Controllers/SnPictureTypeController.cs +++ b/Snblog/Controllers/SnPictureTypeController.cs @@ -12,7 +12,7 @@ namespace Snblog.Controllers [ApiController] public class SnPictureTypeController : ControllerBase { - private readonly ISnPictureTypeService _service; //IOC依赖注入 + private readonly ISnPictureTypeService _service; /// /// 构造函数 /// diff --git a/Snblog/Controllers/SnVideoTypeController.cs b/Snblog/Controllers/SnVideoTypeController.cs index a7d30fb03c16b4ddaf2fa39c2269ba91923d54c8..fc2ee54ae371b1f1bf412e96dbfc10532f97206f 100644 --- a/Snblog/Controllers/SnVideoTypeController.cs +++ b/Snblog/Controllers/SnVideoTypeController.cs @@ -60,7 +60,8 @@ namespace Snblog.Controllers [Authorize(Roles = Permissions.Name)] public async Task AddAsync(SnVideoType entity) { - return Ok(await _service.AddAsync(entity)); + var data = await _service.AddAsync(entity); + return ApiResponse(data:data); } /// @@ -72,7 +73,8 @@ namespace Snblog.Controllers [Authorize(Roles = Permissions.Name)] public async Task DeleteAsync(SnVideoType entity) { - return Ok(await _service.DeleteAsync(entity)); + var data = await _service.DeleteAsync(entity); + return ApiResponse(data: data); } /// @@ -80,11 +82,12 @@ namespace Snblog.Controllers /// /// /// - [HttpPut("UpdateAsync")] + [HttpPut("update")] [Authorize(Roles = Permissions.Name)] public async Task UpdateAsync(SnVideoType entity) { - return Ok(await _service.UpdateAsync(entity)); + var data = await _service.UpdateAsync(entity); + return ApiResponse(data: data); } } } \ No newline at end of file diff --git a/Snblog/Controllers/SnippeLabelController.cs b/Snblog/Controllers/SnippeLabelController.cs index d57d324a1e39727a28790940fd926046948d87f6..de182d475fe43d741f034d695e997b3a53e06d55 100644 --- a/Snblog/Controllers/SnippeLabelController.cs +++ b/Snblog/Controllers/SnippeLabelController.cs @@ -19,6 +19,7 @@ namespace Snblog.Controllers { _service = service; } + #region 查询总数 /// /// 查询总数 diff --git a/Snblog/Controllers/SnippeTypeController.cs b/Snblog/Controllers/SnippeTypeController.cs index d0578321f4e5a2a51208c57219667f95671bd70c..b16878cd1a7698415e463452d8d3395327a861bf 100644 --- a/Snblog/Controllers/SnippeTypeController.cs +++ b/Snblog/Controllers/SnippeTypeController.cs @@ -2,16 +2,16 @@ namespace Snblog.Controllers { - /// /// 片段标签 /// [ApiExplorerSettings(GroupName = "V1")] //版本控制 [ApiController] [Route("snippetType")] - public class SnippeTypeController : ControllerBase + public class SnippeTypeController : BaseController { private readonly ISnippetTypeService _service; //IOC依赖注入 + /// /// 构造函数 /// @@ -20,7 +20,9 @@ namespace Snblog.Controllers { _service = service; } + #region 查询总数 + /// /// 查询总数 /// @@ -29,11 +31,14 @@ namespace Snblog.Controllers [HttpGet("sum")] public async Task GetSumAsync(bool cache = false) { - return Ok(await _service.GetSumAsync(cache)); + var data = await _service.GetSumAsync(cache); + return ApiResponse(data: data, cache: cache); } + #endregion #region 查询所有 + /// /// 查询所有 /// @@ -42,41 +47,51 @@ namespace Snblog.Controllers [HttpGet("all")] public async Task GetAllAsync(bool cache = false) { - return Ok(await _service.GetAllAsync(cache)); + var data = await _service.GetAllAsync(cache); + return ApiResponse(data: data, cache: cache); } + #endregion #region 主键查询 + /// /// 主键查询 /// /// 主键 /// 缓存 /// entity - [HttpGet("byId")] + [HttpGet("bid")] public async Task GetByIdAsync(int id, bool cache = false) { - return Ok(await _service.GetByIdAsync(id, cache)); + var data = await _service.GetByIdAsync(id, cache); + return ApiResponse(data: data, cache: cache); } + #endregion - #region 分页查询 - /// - /// 分页查询 - /// - /// 当前页码 - /// 每页记录条数 - /// 是否倒序 - /// 缓存 - /// list-entity + #region 分页查询 + + /// + /// 分页查询 + /// + /// 当前页码 + /// 每页记录条数 + /// 是否倒序 + /// 缓存 + /// list-entity [HttpGet("paging")] - public async Task GetFyAsync(int pageIndex = 1, int pageSize = 10, bool isDesc = true, bool cache = false) + public async Task GetPagingAsync(int pageIndex = 1, int pageSize = 10, bool isDesc = true, + bool cache = false) { - return Ok(await _service.GetPagingAsync(pageIndex, pageSize, isDesc, cache)); + var data = await _service.GetPagingAsync(pageIndex, pageSize, isDesc, cache); + return ApiResponse(data: data, cache: cache); } + #endregion #region 添加 + /// /// 添加 /// @@ -86,10 +101,14 @@ namespace Snblog.Controllers [Authorize(Roles = Permissions.Name)] public async Task AddAsync(SnippetType entity) { - return Ok(await _service.AddAsync(entity)); + var data = await _service.AddAsync(entity); + return ApiResponse(data: data); } + #endregion + #region 更新数据 + /// /// 更新 /// @@ -99,11 +118,14 @@ namespace Snblog.Controllers [Authorize(Roles = Permissions.Name)] public async Task UpdateAsync(SnippetType entity) { - return Ok(await _service.UpdateAsync(entity)); + var data = await _service.UpdateAsync(entity); + return ApiResponse(data: data); } + #endregion #region 删除 + /// /// 删除 /// @@ -113,8 +135,9 @@ namespace Snblog.Controllers [Authorize(Roles = Permissions.Name)] public async Task DeleteAsync(int id) { - return Ok(await _service.DeleteAsync(id)); + var data = await _service.DeleteAsync(id); + return ApiResponse(data: data); } #endregion } -} +} \ No newline at end of file diff --git a/Snblog/Controllers/SnippetController.cs b/Snblog/Controllers/SnippetController.cs index 91873c6683988b70774159b2f49fd3e95d051fc2..6b457478e59e39af0075a67f4fa93d13b3e00c8e 100644 --- a/Snblog/Controllers/SnippetController.cs +++ b/Snblog/Controllers/SnippetController.cs @@ -6,13 +6,12 @@ namespace Snblog.Controllers /// /// 代码片段 /// - //[Route("api/[controller]")] [ApiExplorerSettings(GroupName = "V1")] //版本控制 [ApiController] [Route("snippet")] public class SnippetController : ControllerBase { - private readonly ISnippetService _service; //IOC依赖注入 + private readonly ISnippetService _service; #region 构造函数 /// diff --git a/Snblog/Controllers/VideoController.cs b/Snblog/Controllers/VideoController.cs index 4ea6894932b04b53f7ca4effd4c5ee8fd6c8ad4e..0b2023d62be72853f560b4a4dc8dae69236773f4 100644 --- a/Snblog/Controllers/VideoController.cs +++ b/Snblog/Controllers/VideoController.cs @@ -44,7 +44,7 @@ namespace Snblog.Controllers /// 是否开启缓存 /// [ApiExplorerSettings(IgnoreApi = true)] //隐藏接口 或者直接对这个方法 private，也可以直接使用obsolete属性 - [HttpGet("GetAllAsync")] + [HttpGet("all")] public async Task GetAllAsync(bool cache = false) { var data = await _service.GetAllAsync(cache); diff --git a/test.txt b/test.txt new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391