修改策略

HaBookCms.AzureStorage/AzureBlob/Implement/AzureBlobDBRepository.cs

@@ -1,5 +1,5 @@
 using HaBookCms.AzureStorage.AzureBlob.Interface;
-using HaBookCms.ServiceOptions.Options;
+using HaBookCms.AzureStorage.ServiceExtension;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 using Microsoft.WindowsAzure.Storage;

HaBookCms.AzureStorage/AzureTable/Implements/AzureTableDBRepository.cs

@@ -1,5 +1,5 @@
 using HaBookCms.AzureStorage.AzureTable.Interfaces;
-using HaBookCms.ServiceOptions.Options;
+using HaBookCms.AzureStorage.ServiceExtension;
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Concurrent;

HaBookCms.AzureStorage/HaBookCms.AzureStorage.csproj

@@ -11,7 +11,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\HaBookCms.Jwt\HaBookCms.Jwt.csproj" />
-    <ProjectReference Include="..\HaBookCms.ServiceOptions\HaBookCms.ServiceOptions.csproj" />
   </ItemGroup>
 
   <ItemGroup>

HaBookCms.ServiceOptions/Options/AzureStorageOptions.cs

@@ -1,6 +1,10 @@
-namespace HaBookCms.ServiceOptions.Options
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace HaBookCms.AzureStorage.ServiceExtension
 {
-    public class  AzureStorageOptions
+    public class AzureStorageOptions
     {
         public string ConnectionString { get; set; } = null;
         /// <summary>

HaBookCms.ServiceOptions/Options/AzureStorageServiceBuilder.cs

@@ -1,7 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using System;
+using System.Collections.Generic;
+using System.Text;
 
-namespace HaBookCms.ServiceOptions.Options
+namespace HaBookCms.AzureStorage.ServiceExtension
 {
     public class AzureStorageServiceBuilder
     {

HaBookCms.ServiceExtension/Extension/ServiceCollectionExtensions.cs

@@ -1,10 +1,11 @@
 using HaBookCms.AzureStorage.AzureTable.Implements;
 using HaBookCms.AzureStorage.AzureTable.Interfaces;
-using HaBookCms.ServiceOptions.Options;
 using Microsoft.Extensions.DependencyInjection;
-namespace HaBookCms.ServiceExtension.Extension
+using System;
+
+namespace HaBookCms.AzureStorage.ServiceExtension
 {
-    public static class ServiceCollectionExtensions
+    public static class AzureStorageServiceCollectionExtensions
     {
 
         /// <summary>
@@ -34,10 +35,10 @@ namespace HaBookCms.ServiceExtension.Extension
         /// <param name="builder"></param>
         /// <param name="_connectionString"></param>
         /// <returns></returns>
-        public static AzureStorageServiceBuilder AddConnection(this AzureStorageServiceBuilder builder, string _connectionString)
+        public static AzureStorageServiceBuilder AddConnection(this AzureStorageServiceBuilder builder, Action<AzureStorageOptions> databaseOptions)
         {
-            AzureStorageOptions databaseOptions = new AzureStorageOptions();
-            databaseOptions.ConnectionString = _connectionString;
+            //   AzureStorageOptions databaseOptions = new AzureStorageOptions();
+            // databaseOptions.ConnectionString = _connectionString;
             builder.Services.AddSingleton(databaseOptions);
             return builder;
         }

HaBookCms.Contest/HaBookCms.Contest.csproj

@@ -19,7 +19,6 @@
     <ProjectReference Include="..\HaBookCms.Core\HaBookCms.Core.csproj" />
     <ProjectReference Include="..\HaBookCms.Jwt\HaBookCms.Jwt.csproj" />
     <ProjectReference Include="..\HaBookCms.RedisStorage\HaBookCms.RedisStorage.csproj" />
-    <ProjectReference Include="..\HaBookCms.ServiceExtension\HaBookCms.ServiceExtension.csproj" />
   </ItemGroup>
 
 </Project>

HaBookCms.Contest/Startup.cs

@@ -5,12 +5,12 @@ using System.Security.Claims;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
+using HaBookCms.AzureStorage.ServiceExtension;
 using HaBookCms.Common.LogHelper;
 using HaBookCms.ContextConfig.Exceptions;
 using HaBookCms.Jwt.Filter;
 using HaBookCms.Jwt.Model;
 using HaBookCms.RedisStorage.Cache;
-using HaBookCms.ServiceExtension.Extension;
 using log4net;
 using log4net.Config;
 using log4net.Repository;
@@ -21,6 +21,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SpaServices.Webpack;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.IdentityModel.Tokens;
@@ -52,8 +53,11 @@ namespace HaBookCms.Contest
 
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddAzureTableStorage().AddConnection(Configuration["AppSettings:Azure:TableStorageConnection"]);
+        {//Configuration["AppSettings:Azure:TableStorageConnection"] 
+            services.AddAzureTableStorage().AddConnection(option=> 
+            {
+                option.ConnectionString = Configuration["AppSettings:Azure:TableStorageConnection"];
+            });
             services.Configure<CookiePolicyOptions>(options =>
             {
                 // This lambda determines whether user consent for non-essential cookies is needed for a given request.
@@ -199,6 +203,10 @@ namespace HaBookCms.Contest
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
+                //app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions
+                //{
+                //    HotModuleReplacement = true
+                //});
             }
             else
             {

HaBookCms.ServiceExtension/HaBookCms.ServiceExtension.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\HaBookCms.AzureStorage\HaBookCms.AzureStorage.csproj" />
-  </ItemGroup>
-
-</Project>

HaBookCms.ServiceOptions/HaBookCms.ServiceOptions.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
-  </ItemGroup>
-
-</Project>

HaBookCms.sln

@@ -43,10 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HaBookCms.IP2Region", "HaBo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HaBookCms.AzureBlobStorageTest", "HaBookCms.AzureBlobStorageTest\HaBookCms.AzureBlobStorageTest.csproj", "{1F3D1D57-BC66-44D5-A2A3-DCD3B0930EA1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HaBookCms.ServiceExtension", "HaBookCms.ServiceExtension\HaBookCms.ServiceExtension.csproj", "{BD988F61-D8C4-4BB6-9C36-FA266441A9BC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HaBookCms.ServiceOptions", "HaBookCms.ServiceOptions\HaBookCms.ServiceOptions.csproj", "{31EADFD5-AACF-4BE4-BB65-053B36C91F97}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -113,14 +109,6 @@ Global
 		{1F3D1D57-BC66-44D5-A2A3-DCD3B0930EA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F3D1D57-BC66-44D5-A2A3-DCD3B0930EA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F3D1D57-BC66-44D5-A2A3-DCD3B0930EA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD988F61-D8C4-4BB6-9C36-FA266441A9BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD988F61-D8C4-4BB6-9C36-FA266441A9BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD988F61-D8C4-4BB6-9C36-FA266441A9BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD988F61-D8C4-4BB6-9C36-FA266441A9BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31EADFD5-AACF-4BE4-BB65-053B36C91F97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31EADFD5-AACF-4BE4-BB65-053B36C91F97}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31EADFD5-AACF-4BE4-BB65-053B36C91F97}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31EADFD5-AACF-4BE4-BB65-053B36C91F97}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -141,8 +129,6 @@ Global
 		{0FB3E14C-41DF-4686-BD7C-7A6E03B1C548} = {4B1BDA90-D27E-4597-9B68-D1D9273F0B5D}
 		{F7832670-7572-4EE7-A61B-9732DE01E9FC} = {CB0A287C-1551-4E69-8CCB-3A32F1CB1536}
 		{1F3D1D57-BC66-44D5-A2A3-DCD3B0930EA1} = {4B1BDA90-D27E-4597-9B68-D1D9273F0B5D}
-		{BD988F61-D8C4-4BB6-9C36-FA266441A9BC} = {ED40E78C-C863-42B7-8D86-41BF178336BB}
-		{31EADFD5-AACF-4BE4-BB65-053B36C91F97} = {ED40E78C-C863-42B7-8D86-41BF178336BB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AE47BE78-B3F5-4723-ACDF-BC403B131012}