移除BaseConfigModel

TEAMModeBI/Startup.cs

@@ -17,7 +17,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using TEAMModelOS.Filter;
 using TEAMModelOS.Models;
-using TEAMModelOS.SDK.Context.Configuration;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Service;
@@ -32,8 +31,6 @@ namespace TEAMModeBI
         public Startup(IConfiguration configuration,IWebHostEnvironment env)
         {
             Configuration = configuration;
-            environment = env;
-            BaseConfigModel.SetBaseConfig(Configuration, env.ContentRootPath, env.WebRootPath);
         }
 
         public IConfiguration Configuration { get; }

TEAMModelOS.SDK/Context/Configuration/BaseConfigModel.cs

@@ -1,32 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace TEAMModelOS.SDK.Context.Configuration
-{
-    public class BaseConfigModel
-    {
-        public static IConfiguration Configuration { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-
-        public static string ContentRootPath { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-
-        public static string WebRootPath { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="config"></param>
-        /// <param name="contentRootPath"></param>
-        /// <param name="webRootPath"></param>
-        public static void SetBaseConfig(IConfiguration config, string contentRootPath, string webRootPath)
-        {
-            Configuration = config;
-            ContentRootPath = contentRootPath;
-            WebRootPath = webRootPath;
-        }
-    }
-}

TEAMModelOS/Controllers/Core/BlobController.cs

@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelOS.SDK.Context.Configuration;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Helper.Common.JsonHelper;
 using TEAMModelOS.SDK.Module.AzureBlob.Configuration;

TEAMModelOS/Controllers/School/SchoolController.cs

@@ -13,14 +13,14 @@ using Azure.Cosmos;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 using System.IO;
-using System.Dynamic;
-using TEAMModelOS.SDK.Context.Configuration;
+using System.Dynamic; 
 using System.Net.Http;
 using System.Net;
 using Newtonsoft.Json;
 using System.Linq;
 using StackExchange.Redis;
 using static TEAMModelOS.SDK.Models.Teacher;
+using Microsoft.Extensions.Configuration;
 
 namespace TEAMModelOS.Controllers
 {
@@ -40,14 +40,15 @@ namespace TEAMModelOS.Controllers
         int baseSpaceSize = 1; //學校保底空間大小(1G)
         private readonly double bytes = 1073741824;
         private readonly int redisAclassoneDbNum = 8; //AclassOne Redis DB號
-
-        public SchoolController(AzureCosmosFactory azureCosmos, AzureStorageFactory azureStorage, AzureRedisFactory azureRedis, DingDing dingDing, IOptionsSnapshot<Option> option)
+        private readonly IConfiguration _configuration;
+        public SchoolController(AzureCosmosFactory azureCosmos, AzureStorageFactory azureStorage, AzureRedisFactory azureRedis, DingDing dingDing, IOptionsSnapshot<Option> option, IConfiguration configuration)
         {
             _azureCosmos = azureCosmos;
             _azureStorage = azureStorage;
             _azureRedis = azureRedis;
             _dingDing = dingDing;
             _option = option?.Value;
+            _configuration = configuration;
         }
         /// <summary>
         /// 保存或更新学校
@@ -474,7 +475,7 @@ namespace TEAMModelOS.Controllers
             List<deviceFromCoreService> result = new List<deviceFromCoreService>();
             try
             {
-                string url = BaseConfigModel.Configuration["HaBookAuth:CoreService:deviceinfo"];
+                string url = _configuration.GetValue<string>("HaBookAuth:CoreService:deviceinfo"); 
                 HttpClient client = new HttpClient();
                 var content = new StringContent(JsonConvert.SerializeObject(uuidList), Encoding.UTF8, "application/json");
                 HttpResponseMessage responseMessage = await client.PostAsync(url, content);

TEAMModelOS/Controllers/School/SchoolTeacherController.cs

@@ -15,8 +15,7 @@ using System.IdentityModel.Tokens.Jwt;
 using System.IO;
 using System.Linq;
 using Microsoft.Extensions.Options;
-using System.Net.Http;
-using TEAMModelOS.SDK.Context.Configuration;
+using System.Net.Http; 
 using System.Net;
 using Microsoft.Extensions.Configuration;
 using TEAMModelOS.SDK.Models.Service;
@@ -610,7 +609,7 @@ namespace TEAMModelOS.Controllers
         {
             try
             {
-                string url = BaseConfigModel.Configuration["HaBookAuth:CoreId:userinfo"];
+                string url = _configuration.GetValue<string>("HaBookAuth:CoreId:userinfo"); 
                 HttpClient client = new HttpClient();
                 var content = new StringContent(request.ToString(), Encoding.UTF8, "application/json");
                 HttpResponseMessage responseMessage = await client.PostAsync(url, content);

TEAMModelOS/Startup.cs

@@ -28,7 +28,6 @@ using TEAMModelOS.Filter;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Context.Attributes.Azure;
-using TEAMModelOS.SDK.Context.Configuration;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Service;
@@ -44,8 +43,6 @@ namespace TEAMModelOS
         public Startup(IConfiguration configuration, IWebHostEnvironment env)
         {
             Configuration = configuration;
-            environment = env;
-            BaseConfigModel.SetBaseConfig(Configuration, env.ContentRootPath, env.WebRootPath);
         }
 
         public IConfiguration Configuration { get; }