还原

CloudBuilder/CloudBuilder.Core/Policy/CoreMessagePolicy.cs

@@ -1,4 +1,5 @@
-using CloudBuilder.Core.DependencyInjection.Form;
+using CloudBuilder.Core.DatabaseAccessor.Entity;
+using CloudBuilder.Core.DependencyInjection.Form;
 using CloudBuilder.Core.DependencyInjection.Policy;
 using CloudBuilder.Core.DependencyInjection.Request;
 using Microsoft.Extensions.DependencyInjection;
@@ -22,9 +23,9 @@ namespace CloudBuilder.Core.Policy
             this.values = new string[] { THE_DATA_HAS_BEEN_MODIFIED, NO_PERMISSION };
         }
 
-        public static CoreMessagePolicy GetInstance()
+        public static CoreMessagePolicy GetInstance(IServiceProvider serviceProvider)
         {
-            instance = ApplicationServiceContext.ServiceProvider.GetKeyedService<CoreMessagePolicy>(typeof(CoreMessagePolicy).Name);
+            instance = serviceProvider.GetKeyedService<CoreMessagePolicy>(typeof(CoreMessagePolicy).Name);
             return instance;
         }
 

CloudBuilder/CloudBuilder.Core/Policy/SearchFilterOperatorPolicy.cs

@@ -1,4 +1,5 @@
 using CloudBuilder.Core.DependencyInjection.Form;
+using CloudBuilder.Core.DependencyInjection.Policy;
 using CloudBuilder.Core.DependencyInjection.Request;
 using Microsoft.Extensions.DependencyInjection;
 using System;
@@ -9,7 +10,7 @@ using System.Threading.Tasks;
 
 namespace System
 {
-    public class SearchFilterOperatorPolicy : AbstractPolicy
+    public class SearchFilterOperatorPolicy : AbstractPolicy, IPolicy
     {
         public const string EQUAL_TO = "equal_to";//='value'
         public const string CONTAIN = "contain";//like '%value%'        
@@ -71,9 +72,9 @@ namespace System
                 };
         }
 
-        public static SearchFilterOperatorPolicy GetInstance()
+        public static SearchFilterOperatorPolicy GetInstance(IServiceProvider serviceProvider)
         {
-            instance = ApplicationServiceContext.ServiceProvider.GetKeyedService<SearchFilterOperatorPolicy>(typeof(SearchFilterOperatorPolicy).Name);
+            instance = serviceProvider.GetKeyedService<SearchFilterOperatorPolicy>(typeof(SearchFilterOperatorPolicy).Name);
             return instance;
         }
 

CloudBuilder/CloudBuilder.Core/Policy/SearchFilterTypePolicy.cs

@@ -1,4 +1,5 @@
 using CloudBuilder.Core.DependencyInjection.Form;
+using CloudBuilder.Core.DependencyInjection.Policy;
 using CloudBuilder.Core.DependencyInjection.Request;
 using Microsoft.Extensions.DependencyInjection;
 using System;
@@ -9,7 +10,7 @@ using System.Threading.Tasks;
 
 namespace System
 {
-    public class SearchFilterTypePolicy : AbstractPolicy
+    public class SearchFilterTypePolicy : AbstractPolicy, IPolicy
     {
         public const string TEXT = "Text";
         public const string TEXT_CONTAIN = "TextContain";
@@ -31,9 +32,9 @@ namespace System
             this.values = new string[] { TEXT, TEXT_CONTAIN, NUMBER, DATE, DATETIME, MULTIPLE_SELECTION, SINGLE_SELECTION };
         }
 
-        public static SearchFilterTypePolicy GetInstance()
+        public static SearchFilterTypePolicy GetInstance(IServiceProvider serviceProvider)
         {
-            instance = ApplicationServiceContext.ServiceProvider.GetKeyedService<SearchFilterTypePolicy>(typeof(SearchFilterTypePolicy).Name);
+            instance = serviceProvider.GetKeyedService<SearchFilterTypePolicy>(typeof(SearchFilterTypePolicy).Name);
             return instance;
         }
     }

CloudBuilder/CloudBuilder.Core/Policy/YesNoPolicy.cs

@@ -18,9 +18,9 @@ namespace System
             this.values = new string[] { YES, NO };
         }
 
-        public static YesNoPolicy GetInstance()
+        public static YesNoPolicy GetInstance(IServiceProvider serviceProvider)
         {
-            instance = ApplicationServiceContext.ServiceProvider.GetKeyedService<YesNoPolicy>(typeof(YesNoPolicy).Name);
+            instance = serviceProvider.GetKeyedService<YesNoPolicy>(typeof(YesNoPolicy).Name);
             return instance;
         }