ow

CloudBuilder/CloudBuilder.Security.Service/SecurityFunctionService.cs

@@ -286,7 +286,7 @@ namespace CloudBuilder.Security.Service
 
             if (maps == null || maps.Length == 0) return;
             int i = 1;
-            foreach (SecurityFunctionMapViewEntity map in maps.ToArray())
+            foreach (SecurityFunctionMapViewEntity map in maps.OrderBy(x=>x.Orderby).ToArray())
             {
                 repositoryMap.InsertNow(new SecurityFunctionMapEntity()
                 {

CloudBuilder/CloudBuilder.Security.Service/SecurityGeneratorNumberService.cs

@@ -9,6 +9,8 @@ using CloudBuilder.Security.Policy;
 using CloudBuilder.Security.SearchCriteria;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
+using System;
 namespace CloudBuilder.Security.Service
 {
     public class SecurityGeneratorNumberService : ISecurityGeneratorNumberService
@@ -16,9 +18,12 @@ namespace CloudBuilder.Security.Service
         private readonly IApplicationService service;
 
         private IRepository<SecurityGeneratorNumberEntity> repository;
+        private readonly YesNoPolicy yesNoPolicy;
+
         public SecurityGeneratorNumberService(IApplicationService service)
         {
             this.service = service;
+            yesNoPolicy = service.ServiceProvider.GetRequiredKeyedService<YesNoPolicy>(nameof(YesNoPolicy));
             repository = service.GetRepository<IRepository<SecurityGeneratorNumberEntity>>();
         }
 
@@ -80,9 +85,9 @@ namespace CloudBuilder.Security.Service
 
             Dictionary<string, Dictionary<string, object>> mappings = new Dictionary<string, Dictionary<string, object>>();
             Dictionary<string, object> validDic = new Dictionary<string, object>();
-            foreach (string v in YesNoPolicy.GetInstance().GetValues())
+            foreach (string v in yesNoPolicy.GetValues())
             {
-                validDic.Add(v, YesNoPolicy.GetInstance().ComposeMessage(v, service.Locale));
+                validDic.Add(v, yesNoPolicy.ComposeMessage(v, service.Locale));
             }
             mappings.Add(SecurityGeneratorNumberEntity.REFRESH_PERIOD, validDic);
 

CloudBuilder/CloudBuilder.Security.Service/SecurityMasterService.cs

@@ -11,17 +11,19 @@ using CloudBuilder.Security.SearchCriteria;
 using CloudBuilder.Security.Utility;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
 using System.Security.Permissions;
 namespace CloudBuilder.Security.Service
 {
     public class SecurityMasterService : ISecurityMasterService
     {
         private readonly IApplicationService service;
-
+        private readonly YesNoPolicy yesNoPolicy;
         private IRepository<SecurityMasterEntity> repository;
         public SecurityMasterService(IApplicationService service)
         {
             this.service = service;
+            yesNoPolicy = service.ServiceProvider.GetRequiredKeyedService<YesNoPolicy>(nameof(YesNoPolicy));
             repository = service.GetRepository<IRepository<SecurityMasterEntity>>();
         }
 
@@ -94,9 +96,9 @@ namespace CloudBuilder.Security.Service
 
             Dictionary<string, Dictionary<string, object>> mappings = new Dictionary<string, Dictionary<string, object>>();
             Dictionary<string, object> validDic = new Dictionary<string, object>();
-            foreach (string v in YesNoPolicy.GetInstance().GetValues())
+            foreach (string v in yesNoPolicy.GetValues())
             {
-                validDic.Add(v, YesNoPolicy.GetInstance().ComposeMessage(v, service.Locale));
+                validDic.Add(v, yesNoPolicy.ComposeMessage(v, service.Locale));
             }
             mappings.Add(SecurityMasterEntity.VALID_INDC, validDic);