Merge pull request #61 from CatLib/1.0

bug fixed
CatLib · Sep 12, 2017 · f3369aa · f3369aa
2 parents dc5c51f + 0db74d4
commit f3369aa
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 59 deletions.
diff --git a/CatLib.sln b/CatLib.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.16
+VisualStudioVersion = 15.0.26430.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CatLib", "projects\CatLib\CatLib.csproj", "{BBB2DAE2-638B-4419-9591-3CECCA312E4E}"
 EndProject

diff --git a/build/CatLib.API.dll b/build/CatLib.API.dll
diff --git a/build/CatLib.API.pdb b/build/CatLib.API.pdb
diff --git a/build/CatLib.API.xml b/build/CatLib.API.xml
diff --git a/build/CatLib.dll b/build/CatLib.dll
diff --git a/build/CatLib.pdb b/build/CatLib.pdb
diff --git a/build/CatLib.xml b/build/CatLib.xml
@@ -7447,6 +7447,31 @@
             当注册服务提供者
             </summary>
         </member>
+        <member name="T:CatLib.Facade.Compress">
+            <summary>
+            压缩器
+            </summary>
+        </member>
+        <member name="T:CatLib.Facade.Converters">
+            <summary>
+            转换器
+            </summary>
+        </member>
+        <member name="T:CatLib.Facade.Dispatcher">
+            <summary>
+            全局事件调度器
+            </summary>
+        </member>
+        <member name="T:CatLib.Facade.Encrypter">
+            <summary>
+            加密器
+            </summary>
+        </member>
+        <member name="T:CatLib.Facade.Hashing">
+            <summary>
+            随机数
+            </summary>
+        </member>
         <member name="T:CatLib.Facade.I18N">
             <summary>
             国际化I18N
@@ -7467,6 +7492,11 @@
             文件系统管理器
             </summary>
         </member>
+        <member name="T:CatLib.Facade.Random">
+            <summary>
+            随机数
+            </summary>
+        </member>
         <member name="T:CatLib.Facade.Router">
             <summary>
             路由
@@ -7669,11 +7699,6 @@
             通配符事件句柄
             </summary>
         </member>
-        <member name="F:CatLib.Events.Dispatcher.actionMapping">
-            <summary>
-            Action对应Func映射
-            </summary>
-        </member>
         <member name="F:CatLib.Events.Dispatcher.syncRoot">
             <summary>
             同步锁
@@ -7732,20 +7757,6 @@
             <param name="life">在几次后事件会被自动释放</param>
             <returns>事件句柄</returns>
         </member>
-        <member name="M:CatLib.Events.Dispatcher.Off(System.String,System.Action{System.Object})">
-            <summary>
-            反注册一个事件
-            </summary>
-            <param name="eventName">事件名</param>
-            <param name="handler">事件句柄</param>
-        </member>
-        <member name="M:CatLib.Events.Dispatcher.WalkActionMapping(System.Action{System.Object},System.Action{System.Func{System.Object,System.Object}})">
-            <summary>
-            遍历行为映射
-            </summary>
-            <param name="handler">事件句柄</param>
-            <param name="callback">回调</param>
-        </member>
         <member name="M:CatLib.Events.Dispatcher.Off(CatLib.Events.EventHandler)">
             <summary>
             移除一个事件
@@ -10689,13 +10700,6 @@
             <param name="life">在几次后事件会被自动释放</param>
             <returns>事件句柄</returns>
         </member>
-        <member name="M:CatLib.Application.Off(System.String,System.Action{System.Object})">
-            <summary>
-            反注册一个事件
-            </summary>
-            <param name="eventName">事件名</param>
-            <param name="handler">事件句柄</param>
-        </member>
         <member name="P:CatLib.Application.Version">
             <summary>
             CatLib版本(遵循semver)

diff --git a/projects/CatLib.API/CatLib/App.cs b/projects/CatLib.API/CatLib/App.cs
@@ -418,11 +418,11 @@ public static IBindData Singleton(string service, Func<IContainer, object[], obj
         /// 以单例的形式绑定一个服务
         /// </summary>
         /// <typeparam name="TService">服务名</typeparam>
-        /// <typeparam name="TConcrete">服务实现</typeparam>
+        /// <typeparam name="TAlias">服务别名</typeparam>
         /// <returns>服务绑定数据</returns>
-        public static IBindData Singleton<TService, TConcrete>() where TConcrete : class
+        public static IBindData Singleton<TService, TAlias>()
         {
-            return Handler.Singleton<TService, TConcrete>();
+            return Handler.Singleton<TService, TAlias>();
         }
 
         /// <summary>
@@ -450,11 +450,11 @@ public static IBindData Singleton<TService>(Func<IContainer, object[], object> c
         /// 常规绑定一个服务
         /// </summary>
         /// <typeparam name="TService">服务名</typeparam>
-        /// <typeparam name="TConcrete">服务实现</typeparam>
+        /// <typeparam name="TAlias">服务别名</typeparam>
         /// <returns>服务绑定数据</returns>
-        public static IBindData Bind<TService, TConcrete>() where TConcrete : class
+        public static IBindData Bind<TService, TAlias>()
         {
-            return Handler.Bind<TService, TConcrete>();
+            return Handler.Bind<TService, TAlias>();
         }
 
         /// <summary>

diff --git a/projects/CatLib.API/Support/Container/ContainerExtend.cs b/projects/CatLib.API/Support/Container/ContainerExtend.cs
@@ -35,12 +35,13 @@ public static IBindData Singleton(this IContainer container, string service,
         /// 以单例的形式绑定一个服务
         /// </summary>
         /// <typeparam name="TService">服务名</typeparam>
-        /// <typeparam name="TConcrete">服务实现</typeparam>
+        /// <typeparam name="TAlias">服务别名</typeparam>
         /// <param name="container">服务容器</param>
         /// <returns>服务绑定数据</returns>
-        public static IBindData Singleton<TService, TConcrete>(this IContainer container) where TConcrete : class
+        public static IBindData Singleton<TService, TAlias>(this IContainer container)
         {
-            return container.Bind(container.Type2Service(typeof(TService)), typeof(TConcrete), true);
+            return container.Bind(container.Type2Service(typeof(TService)), typeof(TService), true)
+                .Alias(container.Type2Service(typeof(TAlias)));
         }
 
         /// <summary>
@@ -71,12 +72,13 @@ public static IBindData Singleton<TService>(this IContainer container,
         /// 常规绑定一个服务
         /// </summary>
         /// <typeparam name="TService">服务名</typeparam>
-        /// <typeparam name="TConcrete">服务实现</typeparam>
+        /// <typeparam name="TAlias">服务别名</typeparam>
         /// <param name="container">服务容器</param>
         /// <returns>服务绑定数据</returns>
-        public static IBindData Bind<TService, TConcrete>(this IContainer container) where TConcrete : class
+        public static IBindData Bind<TService, TAlias>(this IContainer container)
         {
-            return container.Bind(container.Type2Service(typeof(TService)), typeof(TConcrete), false);
+            return container.Bind(container.Type2Service(typeof(TService)), typeof(TService), false)
+                .Alias(container.Type2Service(typeof(TAlias)));
         }
 
         /// <summary>

diff --git a/projects/CatLib.Tests/Support/Container/ContainerHelperTests.cs b/projects/CatLib.Tests/Support/Container/ContainerHelperTests.cs
@@ -77,7 +77,7 @@ public void BindSingletonTServiceTConcrete()
         {
             var container = MakeContainer();
             container.Singleton<TestClassService, ContainerHelperTestClass>();
-            var obj = container.Make(container.Type2Service(typeof(TestClassService)));
+            var obj = container.Make(container.Type2Service(typeof(ContainerHelperTestClass)));
             var obj2 = container.Make(container.Type2Service(typeof(TestClassService)));
 
             Assert.AreSame(obj, obj2);

diff --git a/projects/CatLib.Tests/Support/Container/ContainerTests.cs b/projects/CatLib.Tests/Support/Container/ContainerTests.cs
@@ -894,7 +894,7 @@ public void CanParamUseInjectAttrRequired()
                 container.Make<TestMakeParamInjectAttrRequiredClass>();
             });
 
-            container.Bind<IMsg, MakeTestClassDependency>();
+            container.Bind<MakeTestClassDependency, IMsg>();
             var result = container.Make<TestMakeParamInjectAttrRequiredClass>();
             Assert.AreEqual("hello", result.GetMsg());
         }

diff --git a/projects/CatLib/Encryption/Encrypter.cs b/projects/CatLib/Encryption/Encrypter.cs
@@ -36,6 +36,7 @@ public sealed class Encrypter : IEncrypter
         /// <param name="cipher">加密类型</param>
         public Encrypter(byte[] key, string cipher)
         {
+            Guard.Requires<ArgumentNullException>(key != null);
             this.key = key;
             if (!Supported(key, cipher))
             {