diff --git a/OSS.Common.Tests/LogTests.cs b/OSS.Common.Tests/LogTests.cs index 5cad014..1363f27 100644 --- a/OSS.Common.Tests/LogTests.cs +++ b/OSS.Common.Tests/LogTests.cs @@ -1,4 +1,6 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using OSS.Common.Plugs.CachePlug; using OSS.Common.Plugs.LogPlug; namespace OSS.Common.Tests diff --git a/OSS.Common/OSS.Common.csproj b/OSS.Common/OSS.Common.csproj index 23dd7d0..c1aa2dc 100644 --- a/OSS.Common/OSS.Common.csproj +++ b/OSS.Common/OSS.Common.csproj @@ -3,7 +3,7 @@ netstandard2.0 False - 1.2.6.0 + 1.2.7 False Kevin OSSCoder @@ -13,12 +13,10 @@ http://img1.static.osscoder.com/logo.jpg https://github.com/KevinWG/OSS.Common - 1. 优化HMAC未覆盖的算法 -2. 随机数算法添加启动seed -3. 默认日志功能添加错误Code + 优化插件模块 - 1.2.6.0 - 1.2.6.0 + 1.2.7.0 + 1.2.7.0 https://github.com/KevinWG/OSS.Common/blob/master/LICENSE diff --git a/OSS.Common/Plugs/CachePlug/CacheUtil.cs b/OSS.Common/Plugs/CachePlug/CacheUtil.cs index 762c30a..dabfe37 100644 --- a/OSS.Common/Plugs/CachePlug/CacheUtil.cs +++ b/OSS.Common/Plugs/CachePlug/CacheUtil.cs @@ -12,7 +12,6 @@ #endregion using System; -using System.Collections.Concurrent; namespace OSS.Common.Plugs.CachePlug { @@ -21,7 +20,7 @@ namespace OSS.Common.Plugs.CachePlug /// public static class CacheUtil { - private static readonly DefaultCachePlug defaultCache= new DefaultCachePlug(); + private static readonly DefaultCachePlug defaultCache = new DefaultCachePlug(); /// /// 通过模块名称获取 @@ -47,13 +46,46 @@ namespace OSS.Common.Plugs.CachePlug /// 绝对过期时间 /// 模块名称 /// 是否添加成功 - public static bool AddOrUpdate(string key, T obj, TimeSpan slidingExpiration, DateTime? absoluteExpiration = null, - string moduleName = ModuleNames.Default) + [Obsolete] + public static bool AddOrUpdate(string key, T obj, TimeSpan slidingExpiration, + DateTime? absoluteExpiration = null, + string moduleName = ModuleNames.Default) { return GetCache(moduleName).AddOrUpdate(key, obj, slidingExpiration, absoluteExpiration); } + /// + /// 添加时间段过期缓存 + /// 如果存在则更新 + /// + /// 添加缓存对象类型 + /// 添加对象的key + /// 值 + /// 相对过期的TimeSpan + /// 模块名称 + /// 是否添加成功 + public static bool Set(string key, T obj, TimeSpan slidingExpiration, + string moduleName = ModuleNames.Default) + { + return GetCache(moduleName).Set(key, obj, slidingExpiration); + } + + /// + /// 添加固定过期时间缓存,如果存在则更新 + /// + /// 添加缓存对象类型 + /// 添加对象的key + /// 值 + /// 绝对过期时间,不为空则按照绝对过期时间计算 + /// 模块名称 + /// 是否添加成功 + public static bool Set(string key, T obj, DateTime absoluteExpiration, + string moduleName = ModuleNames.Default) + { + return GetCache(moduleName).Set(key, obj, absoluteExpiration); + } + /// /// 获取缓存对象 /// diff --git a/OSS.Common/Plugs/CachePlug/DefaultCachePlug.cs b/OSS.Common/Plugs/CachePlug/DefaultCachePlug.cs index d54c50e..d7a7d6c 100644 --- a/OSS.Common/Plugs/CachePlug/DefaultCachePlug.cs +++ b/OSS.Common/Plugs/CachePlug/DefaultCachePlug.cs @@ -29,7 +29,8 @@ namespace OSS.Common.Plugs.CachePlug private static readonly MemoryCache m_Cache=new MemoryCache(new MemoryCacheOptions()); #endif /// - /// 添加缓存,如果存在则更新 + /// 添加缓存 + /// 如果存在则更新 /// /// 添加缓存对象类型 /// 添加对象的key @@ -37,11 +38,39 @@ namespace OSS.Common.Plugs.CachePlug /// 相对过期的TimeSpan 如果使用固定时间 =TimeSpan.Zero /// 绝对过期时间,不为空则按照绝对过期时间计算 /// 是否添加成功 + [Obsolete] public bool AddOrUpdate(string key, T obj, TimeSpan slidingExpiration, DateTime? absoluteExpiration = null) { return Add(key, obj, slidingExpiration, absoluteExpiration, true); } + /// + /// 添加时间段过期缓存 + /// 如果存在则更新 + /// + /// 添加缓存对象类型 + /// 添加对象的key + /// 值 + /// 相对过期的TimeSpan + /// 是否添加成功 + public bool Set(string key, T obj, TimeSpan slidingExpiration) + { + return Add(key, obj, slidingExpiration, null, true); + } + + /// + /// 添加固定过期时间缓存,如果存在则更新 + /// + /// 添加缓存对象类型 + /// 添加对象的key + /// 值 + /// 绝对过期时间,不为空则按照绝对过期时间计算 + /// 是否添加成功 + public bool Set(string key, T obj, DateTime absoluteExpiration) + { + return Add(key, obj, TimeSpan.Zero, absoluteExpiration, true); + } + /// /// /// @@ -52,7 +81,8 @@ namespace OSS.Common.Plugs.CachePlug /// /// /// - private static bool Add(string key, T obj, TimeSpan slidingExpiration, DateTime? absoluteExpiration, bool isUpdate) + private static bool Add(string key, T obj, TimeSpan slidingExpiration, DateTime? absoluteExpiration, + bool isUpdate) { if (slidingExpiration == TimeSpan.Zero && absoluteExpiration == null) throw new ArgumentNullException("slidingExpiration", "缓存过期时间不正确,需要设置固定过期时间或者相对过期时间"); @@ -71,7 +101,7 @@ namespace OSS.Common.Plugs.CachePlug return true; #else var opt = new MemoryCacheEntryOptions(); - if (absoluteExpiration != null) + if (absoluteExpiration != null) opt.AbsoluteExpiration = new DateTimeOffset(absoluteExpiration.Value); else opt.SlidingExpiration = slidingExpiration; diff --git a/OSS.Common/Plugs/CachePlug/ICachePlug.cs b/OSS.Common/Plugs/CachePlug/ICachePlug.cs index 747c5f8..9a9edb2 100644 --- a/OSS.Common/Plugs/CachePlug/ICachePlug.cs +++ b/OSS.Common/Plugs/CachePlug/ICachePlug.cs @@ -29,8 +29,30 @@ namespace OSS.Common.Plugs.CachePlug /// ԹڵTimeSpan ʹù̶ʱ =TimeSpan.Zero /// Թʱ,ΪվԹʱ /// Ƿӳɹ + [Obsolete] bool AddOrUpdate(string key, T obj, TimeSpan slidingExpiration, DateTime? absoluteExpiration = null); + /// + /// ʱιڻ + /// + /// + /// ӻ + /// Ӷkey + /// ֵ + /// ԹڵTimeSpan + /// Ƿӳɹ + bool Set(string key, T obj, TimeSpan slidingExpiration); + + /// + /// ӹ̶ʱ仺, + /// + /// ӻ + /// Ӷkey + /// ֵ + /// Թʱ,ΪվԹʱ + /// Ƿӳɹ + bool Set(string key, T obj, DateTime absoluteExpiration); + /// /// ȡ /// diff --git a/OSS.Common/Plugs/DirConfigPlug/DefaultDirConfigPlug.cs b/OSS.Common/Plugs/DirConfigPlug/DefaultDirConfigPlug.cs index eb94ae2..884b88d 100644 --- a/OSS.Common/Plugs/DirConfigPlug/DefaultDirConfigPlug.cs +++ b/OSS.Common/Plugs/DirConfigPlug/DefaultDirConfigPlug.cs @@ -66,7 +66,7 @@ namespace OSS.Common.Plugs.DirConfigPlug var type = typeof(TConfig); - XmlSerializer xmlSer = new XmlSerializer(type); + var xmlSer = new XmlSerializer(type); xmlSer.Serialize(fs, dirConfig); result = new ResultMo(); diff --git a/OSS.Common/Plugs/LogPlug/DefaultLogPlug.cs b/OSS.Common/Plugs/LogPlug/DefaultLogPlug.cs index 6f0ba29..39aa275 100644 --- a/OSS.Common/Plugs/LogPlug/DefaultLogPlug.cs +++ b/OSS.Common/Plugs/LogPlug/DefaultLogPlug.cs @@ -51,7 +51,7 @@ namespace OSS.Common.Plugs.LogPlug return string.Concat(dirPath, DateTime.Now.ToString("yyyyMMddHH"), ".txt"); } - private object obj = new object(); + private readonly object obj = new object(); /// /// 写日志 @@ -61,7 +61,7 @@ namespace OSS.Common.Plugs.LogPlug { lock (obj) { - string filePath = getLogFilePath(info.ModuleName, info.Level); + var filePath = getLogFilePath(info.ModuleName, info.Level); #if NETFW using (StreamWriter sw = new StreamWriter(filePath, true, Encoding.UTF8)) #else diff --git a/OSS.Common/Plugs/ModuleNames.cs b/OSS.Common/Plugs/ModuleNames.cs index 4837b97..fafcdca 100644 --- a/OSS.Common/Plugs/ModuleNames.cs +++ b/OSS.Common/Plugs/ModuleNames.cs @@ -12,6 +12,7 @@ *****************************************************************************/ #endregion + namespace OSS.Common.Plugs { /// @@ -25,24 +26,29 @@ namespace OSS.Common.Plugs public const string Default = "default"; /// - /// 支付模块 + /// 支付中心模块 /// public const string PayCenter = "pay_center"; - - /// - /// 推送中心模块 - /// - public const string PushCenter = "push_center"; - + /// /// 社会化中心 /// public const string SocialCenter = "social_center"; /// - /// 多媒体中心模块 + /// 用户中心模块 /// - public const string MediaStorage = "media_storage"; + public const string User = "user"; + + /// + /// 订单模块 + /// + public const string Order = "order"; + + /// + /// 产品模块 + /// + public const string Product = "order"; } } diff --git a/README.md b/README.md index 4ae8db9..5db1c0b 100644 --- a/README.md +++ b/README.md @@ -1,57 +1,73 @@ -#OS.Common - ͨûʵ֣ṩҪµݣ - 1. ûϵͳ豸Ϣʵ嶨塣 - 2. ӽܷʵ֣ - 3. ʵDTOת̬չʱ䣬ַȵȴ - 4. ־棬ø̬༰ĬϷʵ - 5. ȫֽҳʵ嶨 +# OS.Common +ͨûʵ֣ǰԱ׼ʽṩnet46֧б׼Framework 4.6汾ʵ +ǰҪṩµݣ -###Authrization - ûȨϢģ飬ʹMemberShiperҪԣ - 1. AppAuthorize - ӦӦȨϢҪӦԴͻ˵͵ - 2. MemberInfo - ӦǵǰûϢû - MemberShiper ṩGetTokenûIdͬʱһӦGetTokenDetailtokenнûidϢ - ʹõǼܷʽΪAes +1. ûϵͳ豸Ϣʵ嶨塣 +2. ӽܷʵ֣ +3. ʵDTOת̬չʱ䣬ַȵȴ +4. ־棬ø̬༰ĬϷʵ +5. ȫֽҳʵ嶨 - ʹ÷мfilterиֵȻھҵнеá - ҪעΪ̱߳ʹõ첽̣߳ע⴫ֵӦ̡߳ +## Authrization +ûȨϢģ飬ʹMemberShiperҪԣ +1. AppAuthorize + ӦӦȨϢҪӦԴͻ˵͵ +2. Identity + ӦǵǰûϢû +MemberShiper ṩGetTokenûIdͬʱһӦGetTokenDetailtokenнûidϢ +ʹõǼܷʽΪAes -###ComModels - ϵͳĬʵϢҳʵ ʵ壬ȫʹã - нʵResultMoԣ - Ret-״̬룬ResultTypesöѾѳ״̬Ϣ˼򵥶壬Щ״̬Http״̬Ӧ + +## ComModels +ϵͳĬʵϢҳʵ ʵ壬ȫʹã +нʵResultMoԣ +ret-״̬룬ResultTypesöѾѳ״̬Ϣ˼򵥶壬Щ״̬Http״̬Ӧ 0ʾΪSuccessͬʱ˸IsSuccess()ķչֵΪжϷǷȷ +msg-Ӧ״̬Ϣ - Message-Ӧ״̬Ϣ - IsSuccess-ж״̬ǷȷĬ0ʱȷ +## Encrypt +ϵͳܻ +Ҫmd5Md5,aesAesRijndael,sha1Sha1,hmacsha1HmacSha1-sha1ܷʽ⼸ּ㷨 -###Encrypt - ϵͳܻ - Ҫmd5Md5,aesAesRijndael,sha1Sha1,hmacsha1HmacSha1-sha1ܷʽ⼸ּ㷨 +## Extention +ϵͳչҪ +ַתչ磺 "0".ToInt32()"xxx".Base64UrlEncode() +ʱתչ磺DateTime.Now.ToUtcSeconds() +Taskչ磺 Task.WaitResult() +UrlCodeչ "name=n&code=1".UrlEncode(); +öչ磺 typeof(Enum).ToEnumDirs(); +xmlлչ 磺 "test".DeserializeXml(); -###Extention - ϵͳչҪ - ַתչ磺 "0".ToInt32()"xxx".Base64UrlEncode() - ʱתչ磺DateTime.Now.ToUtcSeconds() - Taskչ磺 Task.WaitResult() - UrlCodeչ "name=n&code=1".UrlEncode(); - öչ磺 typeof(Enum).ToEnumDirs(); - xmlлչ 磺 "test".DeserializeXml(); +## Plugs +ϵͳչģͶӦĬʵ֣ͬʱPlugsĿ¼¶ModuleNames࣬ϵͳģ顣 +и߼󣬱ϵͳͬģʹòIJͬʵ֣ڳڴָģƶӦIJʵ֣޸ҵ + +Ҫֲ + +### һ.CachePlug +ģ飬ڲICachePlugӿڣһ DefaultCachePlugĬϻʵ֣ +ʹʱֱʹ CacheUtil ̬µķSet - Զ֤ OSRequiredAttributeȣʹIsOsValidate֤Ƿ֤ͨ + CacheUtil.Set("key","va",TimeSpan.FromHours(1),"moduleName") -###Modules - ϵͳչģͶӦĬʵ,Ҫ±: + modulename ǿѡ +룬ڳڴԸ OsConfig.CacheProvider(Func) ίиֵ + ǾͿԸʹƵʣҪԣԼϵͳضģµIJͬʵ + òͬģֱRedisMemcacheȣֻǿòͬģʹRedisIJͬʵ + +Ȼίûж壬ίзؿգͻʹĬϻʵ֣ϣȫվͬĻʵֱ֣ӷضӦʵּɡ -####һ.CacheModule - ģ - -####.DirConfig - ֵģ - -####.LogModule - ־ģ +### .DirConfigPlug +ģ飬 ͻʵʽͬһ IDirConfigPlug ӿڣһ DefaultDirConfigPlug ʵ +ʹʱֱʹ DirConfigUtil ̬ࡣ +ĬʵXmlлķʽ浽ļУȻԶָģƵضԴʵ +Ŀÿݿʵ֣Ŀģͨӿʵ֡ + + +### .LogPlug +־ģ飬һڲһ ILogPlug ӿڣһ DefaultLogPlug Ĭʵ +ʹʱֱʹ LogUtil ̬ࡣ +Ĭʵͨ浽ļʽʵ֣ÿСʱһļ +ȻԶָģƵضԴʵЩʼЩͶ֪ͨȡ