resolved #126

Author: ymh199478

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

@@ -789,10 +789,10 @@ public class MakeTestClass
             [Inject]
             public MakeTestClassDependency DependencyRequired { get; set; }
 
-            [Inject("AliasName")]
+            [Inject]
             public MakeTestClassDependency2 DependencyAlias { get; set; }
 
-            [Inject("AliasNameRequired")]
+            [Inject]
             public MakeTestClassDependency DependencyAliasRequired { get; set; }
 
             public MakeTestClass(MakeTestClassDependency dependency)
@@ -950,7 +950,7 @@ public void CanMake()
         public void CheckIllegalMakeTypeIsNotSame()
         {
             var container = MakeContainer();
-            container.Singleton<MakeTestClass>();
+            container.Singleton<MakeTestClass>().Needs("$DependencyAlias").Given("AliasName");
             container.Singleton<MakeTestClassDependency2>().Alias("AliasNameRequired");
             container.Singleton<MakeTestClassDependency>().Alias("AliasName");
 
@@ -1053,8 +1053,7 @@ public void CheckIllegalMake()
         public class TestMakeParamInjectAttrClass
         {
             private IMsg msg;
-            public TestMakeParamInjectAttrClass(
-                [Inject("AliasName")]IMsg msg)
+            public TestMakeParamInjectAttrClass(IMsg msg)
             {
                 this.msg = msg;
             }
@@ -1078,7 +1077,7 @@ public void CanParamUseInjectAttr()
 
             bind.Needs<IMsg>().Given<MakeTestClassDependency>();
             var cls = container.Make<TestMakeParamInjectAttrClass>();
-            Assert.AreEqual("world", cls.GetMsg());
+            Assert.AreEqual("hello", cls.GetMsg());
 
             bind.Needs("AliasName").Given<MakeTestClassDependency>();
             cls = container.Make<TestMakeParamInjectAttrClass>();
@@ -1496,7 +1495,7 @@ public void ComplexContextualRelationshipTest2()
 
         class ComplexClassAlias
         {
-            [Inject("IComplexInterface.alias")]
+            [Inject]
             public IComplexInterface Msg { get; set; }
         }
 
@@ -1507,7 +1506,7 @@ class ComplexClassAlias
         public void ComplexContextualRelationshipTest3()
         {
             var container = MakeContainer();
-            container.Bind<ComplexClassAlias>();
+            container.Bind<ComplexClassAlias>().Needs("$Msg").Given("IComplexInterface.alias");
             container.Bind<ComplexInjectClass1>().Alias<IComplexInterface>();
             container.Bind<ComplexInjectClass2>().Alias("IComplexInterface.alias");
 

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

@@ -1123,10 +1123,7 @@ protected virtual bool ChangeType(ref object result, Type conversionType)
         /// <returns>需求的服务名</returns>
         protected virtual string GetPropertyNeedsService(PropertyInfo property)
         {
-            var injectAttr = (InjectAttribute)property.GetCustomAttributes(injectTarget, false)[0];
-            return string.IsNullOrEmpty(injectAttr.Alias)
-                ? Type2Service(property.PropertyType)
-                : injectAttr.Alias;
+            return Type2Service(property.PropertyType);
         }
 
         /// <summary>
@@ -1136,18 +1133,7 @@ protected virtual string GetPropertyNeedsService(PropertyInfo property)
         /// <returns>需求的服务名</returns>
         protected virtual string GetParamNeedsService(ParameterInfo baseParam)
         {
-            var needService = Type2Service(baseParam.ParameterType);
-            if (!baseParam.IsDefined(injectTarget, false))
-            {
-                return needService;
-            }
-
-            var injectAttr = (InjectAttribute)baseParam.GetCustomAttributes(injectTarget, false)[0];
-            if (!string.IsNullOrEmpty(injectAttr.Alias))
-            {
-                needService = injectAttr.Alias;
-            }
-            return needService;
+            return Type2Service(baseParam.ParameterType);
         }
 
         /// <summary>

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

@@ -17,24 +17,9 @@ namespace CatLib
     /// 注入标记
     /// </summary>
     [AttributeUsage(AttributeTargets.Interface |
-                    AttributeTargets.Parameter |
                     AttributeTargets.Property)]
     public class InjectAttribute : Attribute
     {
-        /// <summary>
-        /// 注入服务的别名或者服务名
-        /// </summary>
-        public string Alias { get; }
-
-        /// <summary>
-        /// 声明注入
-        /// </summary>
-        /// <param name="alias">依赖服务的别名或者服务名</param>
-        public InjectAttribute(string alias)
-        {
-            Alias = alias;
-        }
-
         /// <summary>
         /// 声明注入
         /// </summary>