diff --git a/Blog.Core.Api/Blog.Core.xml b/Blog.Core.Api/Blog.Core.xml index 9350532..6942de5 100644 --- a/Blog.Core.Api/Blog.Core.xml +++ b/Blog.Core.Api/Blog.Core.xml @@ -729,7 +729,7 @@ - + 测试Redis消息队列 diff --git a/Blog.Core.Api/Controllers/ValuesController.cs b/Blog.Core.Api/Controllers/ValuesController.cs index 002f1e6..14e2228 100644 --- a/Blog.Core.Api/Controllers/ValuesController.cs +++ b/Blog.Core.Api/Controllers/ValuesController.cs @@ -2,10 +2,10 @@ using Blog.Core.Common; using Blog.Core.Common.HttpContextUser; using Blog.Core.Common.HttpRestSharp; +using Blog.Core.Common.Redis; using Blog.Core.Common.WebApiClients.HttpApis; using Blog.Core.EventBus; using Blog.Core.EventBus.EventHandling; -using Blog.Core.Extensions; using Blog.Core.Filter; using Blog.Core.IServices; using Blog.Core.Model; @@ -20,6 +20,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq.Expressions; using System.Threading.Tasks; + namespace Blog.Core.Controllers { /// diff --git a/Blog.Core.Common/Redis/Class1.cs b/Blog.Core.Common/Redis/Class1.cs new file mode 100644 index 0000000..3ae0ce7 --- /dev/null +++ b/Blog.Core.Common/Redis/Class1.cs @@ -0,0 +1,6 @@ +namespace Blog.Core.Common.Redis +{ + class Class12 + { + } +} diff --git a/Blog.Core.Common/Redis/Class1.cs.bak b/Blog.Core.Common/Redis/Class1.cs.bak new file mode 100644 index 0000000..bdddad2 --- /dev/null +++ b/Blog.Core.Common/Redis/Class1.cs.bak @@ -0,0 +1,6 @@ +namespace Blog.Core.Common.Redis +{ + class Class1 + { + } +} diff --git a/Blog.Core.Extensions/Redis/IRedisBasketRepository.cs b/Blog.Core.Common/Redis/IRedisBasketRepository.cs similarity index 98% rename from Blog.Core.Extensions/Redis/IRedisBasketRepository.cs rename to Blog.Core.Common/Redis/IRedisBasketRepository.cs index ca1827f..a8f47ab 100644 --- a/Blog.Core.Extensions/Redis/IRedisBasketRepository.cs +++ b/Blog.Core.Common/Redis/IRedisBasketRepository.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -namespace Blog.Core.Extensions +namespace Blog.Core.Common.Redis { /// /// Redis缓存接口 diff --git a/Blog.Core.Extensions/Redis/IRedisCacheManager.cs b/Blog.Core.Common/Redis/IRedisCacheManager.cs similarity index 94% rename from Blog.Core.Extensions/Redis/IRedisCacheManager.cs rename to Blog.Core.Common/Redis/IRedisCacheManager.cs index 56cd4f8..a0f3fc3 100644 --- a/Blog.Core.Extensions/Redis/IRedisCacheManager.cs +++ b/Blog.Core.Common/Redis/IRedisCacheManager.cs @@ -1,6 +1,6 @@ using System; -namespace Blog.Core.Extensions +namespace Blog.Core.Common.Redis { /// /// Redis缓存接口 diff --git a/Blog.Core.Extensions/Redis/RedisBasketRepository.cs b/Blog.Core.Common/Redis/RedisBasketRepository.cs similarity index 98% rename from Blog.Core.Extensions/Redis/RedisBasketRepository.cs rename to Blog.Core.Common/Redis/RedisBasketRepository.cs index 31c7a03..200153e 100644 --- a/Blog.Core.Extensions/Redis/RedisBasketRepository.cs +++ b/Blog.Core.Common/Redis/RedisBasketRepository.cs @@ -1,5 +1,4 @@ -using Blog.Core.Common; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; using StackExchange.Redis; using System; @@ -7,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Blog.Core.Extensions +namespace Blog.Core.Common.Redis { public class RedisBasketRepository : IRedisBasketRepository { diff --git a/Blog.Core.Extensions/Redis/RedisCacheManager.cs b/Blog.Core.Common/Redis/RedisCacheManager.cs similarity index 98% rename from Blog.Core.Extensions/Redis/RedisCacheManager.cs rename to Blog.Core.Common/Redis/RedisCacheManager.cs index ab4704d..3a58c69 100644 --- a/Blog.Core.Extensions/Redis/RedisCacheManager.cs +++ b/Blog.Core.Common/Redis/RedisCacheManager.cs @@ -1,8 +1,7 @@ -using Blog.Core.Common; -using StackExchange.Redis; +using StackExchange.Redis; using System; -namespace Blog.Core.Extensions +namespace Blog.Core.Common.Redis { public class RedisCacheManager : IRedisCacheManager { diff --git a/Blog.Core.Extensions/Redis/RedisSubscribe.cs b/Blog.Core.Common/Redis/RedisSubscribe.cs similarity index 56% rename from Blog.Core.Extensions/Redis/RedisSubscribe.cs rename to Blog.Core.Common/Redis/RedisSubscribe.cs index 55c46fa..dde408c 100644 --- a/Blog.Core.Extensions/Redis/RedisSubscribe.cs +++ b/Blog.Core.Common/Redis/RedisSubscribe.cs @@ -1,20 +1,13 @@ -using Blog.Core.IServices; -using InitQ.Abstractions; +using InitQ.Abstractions; using InitQ.Attributes; using System; using System.Threading.Tasks; -namespace Blog.Core.Extensions.Redis +namespace Blog.Core.Common.Redis { public class RedisSubscribe : IRedisSubscribe { - private readonly IBlogArticleServices _blogArticleServices; - - public RedisSubscribe(IBlogArticleServices blogArticleServices) - { - _blogArticleServices = blogArticleServices; - } - + [Subscribe(RedisMqKey.Loging)] private async Task SubRedisLoging(string msg) { diff --git a/Blog.Core.Extensions/Redis/RedisSubscribe2.cs b/Blog.Core.Common/Redis/RedisSubscribe2.cs similarity index 92% rename from Blog.Core.Extensions/Redis/RedisSubscribe2.cs rename to Blog.Core.Common/Redis/RedisSubscribe2.cs index 6261b06..3145c24 100644 --- a/Blog.Core.Extensions/Redis/RedisSubscribe2.cs +++ b/Blog.Core.Common/Redis/RedisSubscribe2.cs @@ -3,7 +3,7 @@ using InitQ.Attributes; using System; using System.Threading.Tasks; -namespace Blog.Core.Extensions.Redis +namespace Blog.Core.Common.Redis { public class RedisSubscribe2 : IRedisSubscribe { diff --git a/Blog.Core.Extensions/AOP/BlogRedisCacheAOP.cs b/Blog.Core.Extensions/AOP/BlogRedisCacheAOP.cs index 9bc7f7f..974e85f 100644 --- a/Blog.Core.Extensions/AOP/BlogRedisCacheAOP.cs +++ b/Blog.Core.Extensions/AOP/BlogRedisCacheAOP.cs @@ -1,4 +1,5 @@ using Blog.Core.Common; +using Blog.Core.Common.Redis; using Blog.Core.Extensions; using Castle.DynamicProxy; using System; diff --git a/Blog.Core.Extensions/ServiceExtensions/RedisCacheSetup.cs b/Blog.Core.Extensions/ServiceExtensions/RedisCacheSetup.cs index 568742e..17a12a6 100644 --- a/Blog.Core.Extensions/ServiceExtensions/RedisCacheSetup.cs +++ b/Blog.Core.Extensions/ServiceExtensions/RedisCacheSetup.cs @@ -1,4 +1,5 @@ using Blog.Core.Common; +using Blog.Core.Common.Redis; using Microsoft.Extensions.DependencyInjection; using StackExchange.Redis; using System; diff --git a/Blog.Core.Extensions/ServiceExtensions/RedisInitMqSetup.cs b/Blog.Core.Extensions/ServiceExtensions/RedisInitMqSetup.cs index 9b6f281..1874afe 100644 --- a/Blog.Core.Extensions/ServiceExtensions/RedisInitMqSetup.cs +++ b/Blog.Core.Extensions/ServiceExtensions/RedisInitMqSetup.cs @@ -1,5 +1,5 @@ using Blog.Core.Common; -using Blog.Core.Extensions.Redis; +using Blog.Core.Common.Redis; using InitQ; using Microsoft.Extensions.DependencyInjection; using System; diff --git a/Blog.Core.Services/AccessTrendLogServices.cs b/Blog.Core.Services/AccessTrendLogServices.cs index 38c643f..6c77c11 100644 --- a/Blog.Core.Services/AccessTrendLogServices.cs +++ b/Blog.Core.Services/AccessTrendLogServices.cs @@ -12,7 +12,7 @@ namespace Blog.Core.Services { this._dal = dal; base.BaseDal = dal; - } + } } } diff --git a/Blog.Core.Services/AccessTrendLogServices.cs.bak b/Blog.Core.Services/AccessTrendLogServices.cs.bak new file mode 100644 index 0000000..38c643f --- /dev/null +++ b/Blog.Core.Services/AccessTrendLogServices.cs.bak @@ -0,0 +1,18 @@ +using Blog.Core.IRepository.Base; +using Blog.Core.IServices; +using Blog.Core.Model.Models; +using Blog.Core.Services.BASE; + +namespace Blog.Core.Services +{ + public partial class AccessTrendLogServices : BaseServices, IAccessTrendLogServices + { + IBaseRepository _dal; + public AccessTrendLogServices(IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + } + + } +}