zhusenlin/Yi.Admin
1
0
Fork 0
mirror of https://gitee.com/ccnetcore/Yi synced 2026-03-19 16:06:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

更改使用

Browse Source
This commit is contained in:
橙子
2023-01-07 19:41:48 +08:00
parent 898be6c733
commit aed0b8c2e5
7 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/appsettings.json
View File

@@ -48,10 +48,9 @@
//选择缓存
"CacheSelect": "MemoryCache",
//RedisCacheAOP
"RedisCacheAOP_Enabled": false,
//MemoryCacheAOP
"MemoryCacheAOP_Enabled": false,
//缓存Aop
"CacheAOP_Enabled": false,
//缓存种子数据是否开启
"CacheSeed_Enabled": false,

2
Yi.Framework.Net6/Yi.Framework.Common/Base/NullValue.cs
View File

@@ -112,7 +112,7 @@ namespace Yi.Framework.Common.Base
public static string TryStringNull(this object value)
{
return value == null ? "" : value.ToString().Trim();
return value == null ? "" : value.ToString()!.Trim();
}
/// <summary>

2
Yi.Framework.Net6/Yi.Framework.WebCore/AOP/CacheAOPbase.cs → Yi.Framework.Net6/Yi.Framework.Core/Cache/Aop/CacheAOPbase.cs
View File

@@ -10,7 +10,7 @@ using System.Threading.Tasks;
using Yi.Framework.Common.Base;
using Yi.Framework.Common.Helper;
namespace Yi.Framework.WebCore.AOP
namespace Yi.Framework.Core.Cache.Aop
{
public abstract class CacheAOPbase : IInterceptor
{

11
Yi.Framework.Net6/Yi.Framework.WebCore/AOP/MemoryCacheAOP.cs → Yi.Framework.Net6/Yi.Framework.Core/Cache/Aop/MemoryCacheAOP.cs
View File

@@ -1,10 +1,13 @@
using System;
using Castle.DynamicProxy;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Common.Attribute;
using Yi.Framework.Core.Cache;
namespace Yi.Framework.WebCore.AOP
namespace Yi.Framework.Core.Cache.Aop
{
public class MemoryCacheAOP : CacheAOPbase
{
@@ -18,8 +21,8 @@ namespace Yi.Framework.WebCore.AOP
{
var method = invocation.MethodInvocationTarget ?? invocation.Method;
var CachingAttribute = method.GetCustomAttributes(true).FirstOrDefault(x => x.GetType() == typeof(CachingAttribute));
if (CachingAttribute is CachingAttribute qCachingAttribute)
var cachingAttribute = method.GetCustomAttributes(true).FirstOrDefault(x => x.GetType() == typeof(CachingAttribute));
if (cachingAttribute is CachingAttribute qCachingAttribute)
{
//获取自定义缓存键
var cacheKey = CustomCacheKey(invocation);

2
Yi.Framework.Net6/Yi.Framework.WebCore/AOP/RedisCacheAOP.cs → Yi.Framework.Net6/Yi.Framework.Core/Cache/Aop/RedisCacheAOP.cs
View File

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
using Yi.Framework.Core.Cache;
using Yi.Framework.Common.Attribute;
namespace Yi.Framework.WebCore.AOP
namespace Yi.Framework.Core.Cache.Aop
{
public class RedisCacheAOP : CacheAOPbase
{

1
Yi.Framework.Net6/Yi.Framework.Core/Yi.Framework.Core.csproj
View File

@@ -12,6 +12,7 @@
<ItemGroup>
<PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="2.0.8" />
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Consul" Version="1.6.10.3" />
<PackageReference Include="CSRedisCore" Version="3.6.9" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" />

42
Yi.Framework.Net6/Yi.Framework.WebCore/AutoFacExtend/CustomAutofacModule.cs
View File

@@ -12,11 +12,11 @@ using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using Yi.Framework.Common.Abstract;
using Yi.Framework.Core.Cache.Aop;
using Yi.Framework.Interface;
using Yi.Framework.Job;
using Yi.Framework.Repository;
using Yi.Framework.Service;
using Yi.Framework.WebCore.AOP;
using Yi.Framework.WebCore.AutoFacExtend;
using Yi.Framework.WebCore.CommonExtend;
using Yi.Framework.WebCore.Impl;
@@ -46,25 +46,35 @@ namespace Yi.Framework.WebCore.AutoFacExtend
containerBuilder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
var cacheType = new List<Type>();
if (Appsettings.appBool("RedisCacheAOP_Enabled"))
{
containerBuilder.RegisterType<RedisCacheAOP>();
cacheType.Add(typeof(RedisCacheAOP));
}
if (Appsettings.appBool("MemoryCacheAOP_Enabled"))
{
containerBuilder.RegisterType<MemoryCacheAOP>();
cacheType.Add(typeof(MemoryCacheAOP));
}
//containerBuilder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>)).InstancePerLifetimeScope();
//containerBuilder.RegisterGeneric(typeof(BaseService<>)).As(typeof(IBaseService<>)).InstancePerLifetimeScope();
///反射注入服务层及接口层
var assemblysServices = GetDll("Yi.Framework.Service.dll");
containerBuilder.RegisterAssemblyTypes(assemblysServices).PropertiesAutowired(new AutowiredPropertySelector())
.AsImplementedInterfaces()
.InstancePerLifetimeScope()
.EnableInterfaceInterceptors()
.InterceptedBy(cacheType.ToArray());
var regContainerBuilder = containerBuilder.RegisterAssemblyTypes(assemblysServices).PropertiesAutowired(new AutowiredPropertySelector())
.AsImplementedInterfaces()
.InstancePerLifetimeScope()
.EnableInterfaceInterceptors();
if (Appsettings.appBool("CacheAOP_Enabled"))
{
var cacheSelect = Appsettings.app("CacheSelect");
switch (cacheSelect)
{
case "Redis":
containerBuilder.RegisterType<RedisCacheAOP>();
cacheType.Add(typeof(RedisCacheAOP));
break;
case "MemoryCache":
containerBuilder.RegisterType<MemoryCacheAOP>();
cacheType.Add(typeof(MemoryCacheAOP));
break;
default: throw new ArgumentException("CacheSelect配置填的是什么东西？俺不认得");
}
regContainerBuilder.InterceptedBy(cacheType.ToArray());
}
//开启工作单元拦截
//.InterceptedBy(typeof(UnitOfWorkInterceptor));