resolved #175

Author: ymh199478

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

@@ -2249,6 +2249,43 @@ public int TestContainerCall(int num)
             return num;
         }
 
+        public class TestNullableValue
+        {
+            public int? Nullable1 { get; set; }
+            public byte? Nullable2 { get; set; }
+
+            [Inject]
+            public int? Nullable3 { get; set; }
+
+            [Inject]
+            public byte? Nullable4 { get; set; }
+
+            public TestNullableValue(int? nullable1, byte? nullable2)
+            {
+                Nullable1 = nullable1;
+                Nullable2 = nullable2;
+            }
+        }
+
+        [TestMethod]
+        public void TestNullable()
+        {
+            var container = new Container();
+            container.Singleton<TestNullableValue>().Needs("$Nullable3").Given(() => 100);
+
+            var v = container.Make<TestNullableValue>(10);
+
+            Assert.AreEqual(true, v.Nullable1.HasValue);
+            Assert.AreEqual(10, v.Nullable1.Value);
+
+            Assert.AreEqual(false, v.Nullable2.HasValue);
+
+            Assert.AreEqual(true, v.Nullable3.HasValue);
+            Assert.AreEqual(100, v.Nullable3.Value);
+
+            Assert.AreEqual(false, v.Nullable4.HasValue);
+        }
+
         #region Rebound
         [TestMethod]
         public void TestOnRebound()

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

@@ -1240,7 +1240,19 @@ protected virtual bool ResloveFromContextual(Bindable makeServiceBindData, strin
         /// <returns>解决结果</returns>
         protected virtual object ResolveAttrPrimitive(Bindable makeServiceBindData, string service, PropertyInfo baseParam)
         {
-            return ResloveAttrClass(makeServiceBindData, service, baseParam);
+            if (ResloveFromContextual(makeServiceBindData, service, baseParam.Name, baseParam.PropertyType,
+                out object instance))
+            {
+                return instance;
+            }
+
+            if (baseParam.PropertyType.IsGenericType && baseParam.PropertyType.GetGenericTypeDefinition() ==
+                typeof(Nullable<>))
+            {
+                return null;
+            }
+
+            throw MakeUnresolvableException(baseParam.Name, baseParam.DeclaringType);
         }
 
         /// <summary>
@@ -1270,7 +1282,25 @@ protected virtual object ResloveAttrClass(Bindable makeServiceBindData, string s
         /// <returns>解决结果</returns>
         protected virtual object ResolvePrimitive(Bindable makeServiceBindData, string service, ParameterInfo baseParam)
         {
-            return ResloveClass(makeServiceBindData, service, baseParam);
+            if (ResloveFromContextual(makeServiceBindData, service, baseParam.Name, baseParam.ParameterType,
+                out object instance))
+            {
+                return instance;
+            }
+
+            if (baseParam.IsOptional)
+            {
+                return baseParam.DefaultValue;
+            }
+
+            if (baseParam.ParameterType.IsGenericType && baseParam.ParameterType.GetGenericTypeDefinition() ==
+                typeof(Nullable<>))
+            {
+                return null;
+            }
+
+            throw MakeUnresolvableException(baseParam.Name,
+                baseParam.Member != null ? baseParam.Member.DeclaringType : null);
         }
 
         /// <summary>