resolved #72

Author: 喻斌

src/CatLib.Core.Tests/Support/Container/ContainerTests.cs

@@ -701,7 +701,7 @@ public void TestContainerCallWithNullParams()
         {
             var container = MakeContainer();
             container.Instance("num", 777);
-            container.Alias("@num", "num");
+            container.Alias("$num", "num");
             var result = container.Call(this, "TestContainerCall", null);
             Assert.AreEqual(777, result);
         }
@@ -710,7 +710,7 @@ public void TestContainerCallWithNullParams()
         public void TestContainerCallWithErrorParams()
         {
             var container = MakeContainer();
-            container.Singleton("num", (_, __) => "helloworld").Alias("@num");
+            container.Singleton("num", (_, __) => "helloworld").Alias("$num");
             ExceptionAssert.Throws<UnresolvableException>(() =>
             {
                 container.Call(this, "TestContainerCall", null);
@@ -850,7 +850,7 @@ public void MakeNoClassAttrInject()
         {
             var container = MakeContainer();
             container.Bind<NoClassAttrInject>();
-            container.Bind("Time", (c, p) => 100, false).Alias("@Time");
+            container.Bind("Time", (c, p) => 100, false).Alias("$Time");
 
             var result = container.Make<NoClassAttrInject>();
             Assert.AreEqual(100, result.Time);
@@ -907,7 +907,7 @@ public void MakeNotClassConstructor()
             var container = MakeContainer();
             container.Bind<MakeTestNoParamClass>();
             container.Bind<MakeTestClassDependency>();
-            container.Singleton("i", (_,__) => 77).Alias("@i");
+            container.Singleton("i", (_,__) => 77).Alias("$i");
             var result = container.Make<MakeTestNoParamClass>();
             Assert.AreEqual(77, result.I);
             Assert.AreNotEqual(null, result.Dependency);
@@ -1890,7 +1890,7 @@ public void TestFormatException()
         {
             var container = new Container();
             container.Instance("num", 10);
-            container.Alias("@num", "num");
+            container.Alias("$num", "num");
             Assert.AreEqual(10, container.Call(this, "TestContainerCall", new ContainerTest()));
         }
 
@@ -2064,12 +2064,12 @@ public void TestResloveAttrClassSpeculationServiceFunc()
             var container = new Container();
             container.Bind<TestResloveAttrClassSpeculationService>();
             container.Instance("ex", new UnresolvableException());
-            container.Alias("@ex", "ex");
+            container.Alias("$ex", "ex");
             container.Instance("rex", new UnresolvableException());
-            container.Alias("@rex", "rex");
+            container.Alias("$rex", "rex");
             var cls = container.Make<TestResloveAttrClassSpeculationService>();
 
-            Assert.AreSame(container.Make("@ex"), cls.ex);
+            Assert.AreSame(container.Make("$ex"), cls.ex);
         }
 
         [TestMethod]
@@ -2078,7 +2078,7 @@ public void TestResloveAttrClassSpeculationServiceAttrs()
             var container = new Container();
             container.Bind<TestResloveAttrClassSpeculationService>();
             container.Instance("ex", new UnresolvableException());
-            container.Alias("@ex", "ex");
+            container.Alias("$ex", "ex");
 
             ExceptionAssert.Throws<UnresolvableException>(() =>
             {

src/CatLib.Core.Tests/Support/Container/MethodContainerTests.cs

@@ -143,15 +143,15 @@ public void TestContainerMethodContextual()
             new Application();
 
             App.Instance("input", 1000);
-            App.Alias("@input", "input");
+            App.Alias("$input", "input");
             App.Instance("input2", 2000);
-            App.Alias("@input2", "input2");
+            App.Alias("$input2", "input2");
 
             var cls = new TestContainerClass();
-            App.BindMethod("Helloworld.Func1", cls).Needs("@input").Given("@input2");
+            App.BindMethod("Helloworld.Func1", cls).Needs("$input").Given("$input2");
             App.BindMethod("Helloworld.Func2", cls)
-                .Needs("@input").Given("@input2")
-                .Needs("@input2").Given("@input"); ;
+                .Needs("$input").Given("$input2")
+                .Needs("$input2").Given("$input"); ;
 
             Assert.AreEqual(2000, App.Invoke("Helloworld.Func1"));
             Assert.AreEqual((float)1000, App.Invoke("Helloworld.Func2"));

src/CatLib.Core/Support/Container/Container.cs

@@ -1179,15 +1179,32 @@ protected virtual object ResloveClass(Bindable makeServiceBindData, string servi
         /// <returns>推测的服务</returns>
         protected virtual object SpeculationServiceByParamName(Bindable makeServiceBindData, string paramName, Type paramType)
         {
-            var service = makeServiceBindData.GetContextual($"@{paramName}");
-
-            if (!CanMake(service))
+            foreach (var tag in GetVariableTags())
             {
-                return null;
+                var service = makeServiceBindData.GetContextual($"{tag}{paramName}");
+
+                if (!CanMake(service))
+                {
+                    continue;
+                }
+
+                var instance = Make(service);
+                if (ChangeType(ref instance, paramType))
+                {
+                    return instance;
+                }
             }
 
-            var instance = Make(service);
-            return ChangeType(ref instance, paramType) ? instance : null;
+            return null;
+        }
+
+        /// <summary>
+        /// 获取变量标签
+        /// </summary>
+        /// <returns>变量标签</returns>
+        protected virtual char[] GetVariableTags()
+        {
+            return new [] {'$', '@'};
         }
 
         /// <summary>