From 392afa1b727de3e7c5a619d2031625a7e68f698c Mon Sep 17 00:00:00 2001
From: oldli <wenju1991@163.com>
Date: Wed, 6 Nov 2019 09:52:41 +0800
Subject: [PATCH 01/71] =?UTF-8?q?=E5=85=BC=E5=AE=B9.net=20core=203.0?=
 =?UTF-8?q?=E5=92=8C2.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                     |  2 +-
 src/Library/Application/Application.csproj    |  4 +--
 src/Library/Domain/Domain.csproj              |  6 ++--
 .../Infrastructure/Infrastructure.csproj      | 35 ++++++++++++++++++-
 .../T4/src/Library/Application/Csproj.cs      |  4 +--
 .../T4/src/Library/Application/Csproj.tt      |  4 +--
 .../Default/T4/src/Library/Domain/Csproj.cs   |  6 ++--
 .../Default/T4/src/Library/Domain/Csproj.tt   |  6 ++--
 .../T4/src/Library/Infrastructure/Csproj.cs   |  2 +-
 .../T4/src/Library/Infrastructure/Csproj.tt   |  2 +-
 .../Templates/Default/T4/src/Web/Csproj.cs    | 21 ++++++-----
 .../Templates/Default/T4/src/Web/Csproj.tt    | 10 +++---
 .../Default/T4/src/Web/ModuleInitializer.cs   | 17 +++++----
 .../Default/T4/src/Web/ModuleInitializer.tt   |  9 +++++
 .../Default/T4/src/WebHost/Csproj.cs          | 14 ++++----
 .../Default/T4/src/WebHost/Csproj.tt          | 14 ++++----
 .../_modules/CodeGenerator/_module.json       |  2 +-
 src/Web/ModuleInitializer.cs                  |  9 +++++
 src/Web/Web.csproj                            | 10 +++---
 src/WebHost/WebHost.csproj                    | 12 +++----
 20 files changed, 125 insertions(+), 64 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index bc51e45..4ede0c2 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
     <Id>CodeGenerator</Id>
     <Name>代码生成器</Name>
     <Authors>Oldli</Authors>
-    <Version>1.4.5</Version>
+    <Version>1.5.0</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 422e12b..d6026e9 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.4.1" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.4.1" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.5.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index d4b2cf8..08a1105 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.4.1" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.4.1" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.4.1" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.5.0" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 7ffd62f..e401400 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -7,7 +7,7 @@
   <Import Project="..\..\..\build\module.build.targets" />
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.4.1" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.5.0" />
     <PackageReference Include="System.CodeDom" Version="4.6.0" />
   </ItemGroup>
 
@@ -665,4 +665,37 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Templates\Default\T4\src\Library\Application\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\Library\Domain\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\WebHost\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\Web\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\Web\ModuleInitializer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ModuleInitializer.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
index 1034412..99eec5a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
@@ -34,14 +34,14 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Query\" Version=\"1.4.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Query\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
             #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Mapper.AutoMapper\" Version=\"1.4.0\" />\r\n  </ItemGroup>\r\n\r\n  <ItemGroup>\r\n    " +
+            this.Write(".Lib.Mapper.AutoMapper\" Version=\"1.5.0\" />\r\n  </ItemGroup>\r\n\r\n  <ItemGroup>\r\n    " +
                     "<ProjectReference Include=\"..\\Infrastructure\\Infrastructure.csproj\" />\r\n  </Item" +
                     "Group>\r\n\r\n</Project>\r\n");
             return this.GenerationEnvironment.ToString();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
index d994246..3e1db19 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.4.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Mapper.AutoMapper" Version="1.4.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Mapper.AutoMapper" Version="1.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
index cf782d9..b977088 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
@@ -34,21 +34,21 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Core\" Version=\"1.4.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Core\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
             #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Query\" Version=\"1.4.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Query\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
             #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Core\" Version=\"1.4.0\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n\r\n");
+            this.Write(".Lib.Utils.Core\" Version=\"1.5.0\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
index b9b4e2f..864811f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Lib.Data.Core" Version="1.4.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.4.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="1.4.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.Core" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="1.5.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
index 3f1c519..d35292a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
@@ -35,7 +35,7 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Module.Admin.Domain\" Version=\"1.4.0\" />\r\n  </ItemGroup>\r\n \r\n  <ItemGroup>\r\n    <" +
+            this.Write(".Module.Admin.Domain\" Version=\"1.5.0\" />\r\n  </ItemGroup>\r\n \r\n  <ItemGroup>\r\n    <" +
                     "ProjectReference Include=\"..\\Domain\\Domain.csproj\" />\r\n  </ItemGroup>\r\n\r\n</Proje" +
                     "ct>\r\n");
             return this.GenerationEnvironment.ToString();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
index 789c98f..029da7d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
@@ -8,7 +8,7 @@
   <Import Project="..\..\..\build\module.build.targets" />
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Module.Admin.Domain" Version="1.4.0" />
+    <PackageReference Include="<#= _prefix #>.Module.Admin.Domain" Version="1.5.0" />
   </ItemGroup>
  
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
index c85140b..e3010cb 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
@@ -25,38 +25,43 @@ public partial class Csproj : CsprojBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n  <PropertyGroup>\r\n    <TargetFramework>netc" +
-                    "oreapp3.0</TargetFramework>\r\n    <GenerateDocumentationFile>false</GenerateDocum" +
-                    "entationFile>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n    <PackageReference Includ" +
-                    "e=\"");
+            this.Write(@"<Project Sdk=""Microsoft.NET.Sdk"">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include=""");
             
             #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Auth.Web\" Version=\"1.4.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Auth.Web\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
             #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Module.AspNetCore\" Version=\"1.4.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Module.AspNetCore\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
             #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Mvc\" Version=\"1.4.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Utils.Mvc\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
             #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Validation.FluentValidation\" Version=\"1.4.0\" />\r\n  </ItemGroup>\r\n\r\n  <ItemGr" +
+            this.Write(".Lib.Validation.FluentValidation\" Version=\"1.5.0\" />\r\n  </ItemGroup>\r\n\r\n  <ItemGr" +
                     "oup>\r\n    <ProjectReference Include=\"..\\Library\\Application\\Application.csproj\" " +
                     "/>\r\n  </ItemGroup>\r\n\r\n</Project>\r\n");
             return this.GenerationEnvironment.ToString();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
index 54b321b..3db6fab 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
@@ -2,15 +2,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Lib.Auth.Web" Version="1.4.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Module.AspNetCore" Version="1.4.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Utils.Mvc" Version="1.4.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Validation.FluentValidation" Version="1.4.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Auth.Web" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Module.AspNetCore" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Utils.Mvc" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Validation.FluentValidation" Version="1.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
index 2d45afc..b839d01 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
@@ -25,25 +25,26 @@ public partial class ModuleInitializer : ModuleInitializerBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("using Microsoft.AspNetCore.Builder;\r\nusing Microsoft.AspNetCore.Mvc;\r\nusing Micro" +
-                    "soft.Extensions.DependencyInjection;\r\nusing Microsoft.Extensions.Hosting;\r\nusing" +
-                    " ");
+            this.Write("using Microsoft.AspNetCore.Builder;\r\n#if NETSTANDARD2_0\r\nusing Microsoft.AspNetCo" +
+                    "re.Hosting;\r\n#endif\r\nusing Microsoft.AspNetCore.Mvc;\r\nusing Microsoft.Extensions" +
+                    ".DependencyInjection;\r\n#if NETCOREAPP3_0\r\nusing Microsoft.Extensions.Hosting;\r\n#" +
+                    "endif\r\nusing ");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Module.AspNetCore;\r\n\r\nnamespace ");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
             
             #line default
@@ -65,7 +66,11 @@ public void ConfigureServices(IServiceCollection services)
         /// </summary>
         /// <param name=""app""></param>
         /// <param name=""env""></param>
+#if NETSTANDARD2_0
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+#elif NETCOREAPP3_0
         public void Configure(IApplicationBuilder app, IHostEnvironment env)
+#endif
         {
         }
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
index eb47914..6101e8a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
@@ -1,8 +1,13 @@
 <#@ template language="C#" #>
 using Microsoft.AspNetCore.Builder;
+#if NETSTANDARD2_0
+using Microsoft.AspNetCore.Hosting;
+#endif
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
+#if NETCOREAPP3_0
 using Microsoft.Extensions.Hosting;
+#endif
 using <#= _prefix #>.Lib.Module.AspNetCore;
 
 namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Web
@@ -22,7 +27,11 @@ namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Web
         /// </summary>
         /// <param name="app"></param>
         /// <param name="env"></param>
+#if NETSTANDARD2_0
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+#elif NETCOREAPP3_0
         public void Configure(IApplicationBuilder app, IHostEnvironment env)
+#endif
         {
         }
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
index 2636d0d..60a77d4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
@@ -34,49 +34,49 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Cache.MemoryCache\" Version=\"1.4.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Cache.MemoryCache\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
             #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Cache.Redis\" Version=\"1.4.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Cache.Redis\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
             #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.SqlServer\" Version=\"1.4.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.SqlServer\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
             #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.MySql\" Version=\"1.4.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.MySql\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
             #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.SQLite\" Version=\"1.4.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.SQLite\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
             #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Host.Web\" Version=\"1.4.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Host.Web\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
             #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(@".Module.Admin.Web"" Version=""1.4.0"" />
+            this.Write(@".Module.Admin.Web"" Version=""1.5.0"" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
index ae74fa5..0e94269 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
@@ -6,13 +6,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Lib.Cache.MemoryCache" Version="1.4.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Cache.Redis" Version="1.4.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.SqlServer" Version="1.4.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.MySql" Version="1.4.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.SQLite" Version="1.4.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Host.Web" Version="1.4.0" />
-    <PackageReference Include="<#= _prefix #>.Module.Admin.Web" Version="1.4.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Cache.MemoryCache" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Cache.Redis" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.SqlServer" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.MySql" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.SQLite" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Host.Web" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Module.Admin.Web" Version="1.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
index 8d317de..bd84741 100644
--- a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
+++ b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.4.5"}
+{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.0"}
diff --git a/src/Web/ModuleInitializer.cs b/src/Web/ModuleInitializer.cs
index ed4adba..4014f24 100644
--- a/src/Web/ModuleInitializer.cs
+++ b/src/Web/ModuleInitializer.cs
@@ -1,7 +1,12 @@
 using Microsoft.AspNetCore.Builder;
+#if NETSTANDARD2_0
+using Microsoft.AspNetCore.Hosting;
+#endif
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
+#if NETCOREAPP3_0
 using Microsoft.Extensions.Hosting;
+#endif
 using NetModular.Lib.Module.AspNetCore;
 
 namespace NetModular.Module.CodeGenerator.Web
@@ -21,7 +26,11 @@ public void ConfigureServices(IServiceCollection services)
         /// </summary>
         /// <param name="app"></param>
         /// <param name="env"></param>
+#if NETSTANDARD2_0
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+#elif NETCOREAPP3_0
         public void Configure(IApplicationBuilder app, IHostEnvironment env)
+#endif
         {
         }
 
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index d3acc59..a76df23 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.4.1" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.4.1" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.4.1" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.4.1" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.5.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index f66fbe1..4f472e5 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -5,12 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.4.1" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.4.1" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.4.1" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.4.1" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.4.1" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.4.1" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.0" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.0" />
   </ItemGroup>
 
   <ItemGroup>

From 446085bd0649cbe96af22493d1bf4b4ead6cbada Mon Sep 17 00:00:00 2001
From: oldli <wenju1991@163.com>
Date: Wed, 6 Nov 2019 18:12:04 +0800
Subject: [PATCH 02/71] upgrade nuget

---
 src/WebHost/WebHost.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 4f472e5..59ea338 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -9,7 +9,7 @@
     <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.5.0" />
     <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.5.0" />
     <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.5.0" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.1" />
     <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.0" />
   </ItemGroup>
 

From b581825cc2f6bba6b61f648d659e2598c9aefae6 Mon Sep 17 00:00:00 2001
From: oldli <wenju1991@163.com>
Date: Wed, 6 Nov 2019 21:23:18 +0800
Subject: [PATCH 03/71] =?UTF-8?q?=E4=BD=BF=E7=94=A8terser-webpack-plugin?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2uglifyjs-webpack-plugin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                     |  2 +-
 .../Infrastructure/Infrastructure.csproj      | 10 ++++++++
 .../Default/T4/src/UI/App/Package.cs          |  2 +-
 .../Default/T4/src/UI/App/Package.tt          |  2 +-
 .../Default/T4/src/UI/App/VueConfig.cs        | 23 +++++++++----------
 .../Default/T4/src/UI/App/VueConfig.tt        | 15 ++++++------
 .../_modules/CodeGenerator/_module.json       |  2 +-
 src/UI/module-code-generator/package.json     |  2 +-
 src/UI/module-code-generator/vue.config.js    | 15 ++++++------
 9 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 4ede0c2..e001af3 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
     <Id>CodeGenerator</Id>
     <Name>代码生成器</Name>
     <Authors>Oldli</Authors>
-    <Version>1.5.0</Version>
+    <Version>1.5.1</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index e401400..8268259 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -681,6 +681,16 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Csproj.tt</DependentUpon>
     </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\Package.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Package.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\VueConfig.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>VueConfig.tt</DependentUpon>
+    </Compile>
     <Compile Update="Templates\Default\T4\src\WebHost\Csproj.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
index e065e08..85ed3af 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
@@ -96,7 +96,7 @@ public virtual string TransformText()
         ""rimraf"": ""^3.0.0"",
         ""sass"": ""^1.22.10"",
         ""sass-loader"": ""^7.3.1"",
-        ""uglifyjs-webpack-plugin"": ""^2.2.0"",
+        ""terser-webpack-plugin"": ""^2.2.1"",
         ""vue-template-compiler"": ""^2.6.10""
     }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
index 33c0a19..684adce 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
@@ -33,7 +33,7 @@
         "rimraf": "^3.0.0",
         "sass": "^1.22.10",
         "sass-loader": "^7.3.1",
-        "uglifyjs-webpack-plugin": "^2.2.0",
+        "terser-webpack-plugin": "^2.2.1",
         "vue-template-compiler": "^2.6.10"
     }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
index 587ba0c..851d9d0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
@@ -26,9 +26,9 @@ public partial class VueConfig : VueConfigBase
         public virtual string TransformText()
         {
             this.Write("const path = require(\'path\')\r\nconst CopyWebpackPlugin = require(\'copy-webpack-plu" +
-                    "gin\')\r\nconst UglifyJsPlugin = require(\'uglifyjs-webpack-plugin\')\r\nconst isDev = " +
-                    "process.env.NODE_ENV === \'development\' // ��������\r\n\r\n// ���ӻ�������\r\nprocess.env.VUE_APP" +
-                    "_COPYRIGHT = \'");
+                    "gin\')\r\nconst TerserPlugin = require(\'terser-webpack-plugin\')\r\nconst isDev = proc" +
+                    "ess.env.NODE_ENV === \'development\' // ��������\r\n\r\n// ���ӻ�������\r\nprocess.env.VUE_APP_COP" +
+                    "YRIGHT = \'");
             
             #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Copyright));
@@ -113,15 +113,14 @@ public virtual string TransformText()
       // �ǿ�������
       .when(!isDev, config => {
         config.optimization.minimizer([
-          new UglifyJsPlugin({
-            uglifyOptions: {
-              // �Ƴ� console
-              // �����Ż�ѡ�� https://segmentfault.com/a/1190000010874406
-              warnings: false,
+          new TerserPlugin({
+            cache: true,
+            parallel: true,
+            sourceMap: false, // Must be set to true if using source-maps in production
+            terserOptions: {
               compress: {
                 drop_console: true,
-                drop_debugger: true,
-                pure_funcs: ['console.log']
+                drop_debugger: true
               }
             }
           })
@@ -139,14 +138,14 @@ public virtual string TransformText()
             skins: {
               name: 'chunk-");
             
-            #line 85 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 84 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write("-ui\',\r\n              priority: 10,\r\n              test: /[\\\\/]node_modules[\\\\/]");
             
-            #line 87 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 86 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
index 9249233..047ce81 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
@@ -1,7 +1,7 @@
 <#@ template language="C#" #>
 const path = require('path')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
+const TerserPlugin = require('terser-webpack-plugin')
 const isDev = process.env.NODE_ENV === 'development' // 开发环境
 
 // 增加环境变量
@@ -58,15 +58,14 @@ module.exports = {
       // 非开发环境
       .when(!isDev, config => {
         config.optimization.minimizer([
-          new UglifyJsPlugin({
-            uglifyOptions: {
-              // 移除 console
-              // 其它优化选项 https://segmentfault.com/a/1190000010874406
-              warnings: false,
+          new TerserPlugin({
+            cache: true,
+            parallel: true,
+            sourceMap: false, // Must be set to true if using source-maps in production
+            terserOptions: {
               compress: {
                 drop_console: true,
-                drop_debugger: true,
-                pure_funcs: ['console.log']
+                drop_debugger: true
               }
             }
           })
diff --git a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
index bd84741..c2b7454 100644
--- a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
+++ b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.0"}
+{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.1"}
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index bdabe5a..302096c 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -36,7 +36,7 @@
         "rimraf": "^3.0.0",
         "sass": "^1.22.10",
         "sass-loader": "^7.2.0",
-        "uglifyjs-webpack-plugin": "^2.2.0",
+        "terser-webpack-plugin": "^2.2.1",
         "vue-template-compiler": "^2.6.10"
     }
 }
\ No newline at end of file
diff --git a/src/UI/module-code-generator/vue.config.js b/src/UI/module-code-generator/vue.config.js
index 2cf323e..4f475f4 100644
--- a/src/UI/module-code-generator/vue.config.js
+++ b/src/UI/module-code-generator/vue.config.js
@@ -1,6 +1,6 @@
 const path = require('path')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
+const TerserPlugin = require('terser-webpack-plugin')
 const isDev = process.env.NODE_ENV === 'development' // 开发环境
 
 // 增加环境变量
@@ -57,15 +57,14 @@ module.exports = {
       // 非开发环境
       .when(!isDev, config => {
         config.optimization.minimizer([
-          new UglifyJsPlugin({
-            uglifyOptions: {
-              // 移除 console
-              // 其它优化选项 https://segmentfault.com/a/1190000010874406
-              warnings: false,
+          new TerserPlugin({
+            cache: true,
+            parallel: true,
+            sourceMap: false, // Must be set to true if using source-maps in production
+            terserOptions: {
               compress: {
                 drop_console: true,
-                drop_debugger: true,
-                pure_funcs: ['console.log']
+                drop_debugger: true
               }
             }
           })

From 792c978e3ad6c4bc0c5567857c5bc64b7df8fc29 Mon Sep 17 00:00:00 2001
From: oldli <wenju1991@163.com>
Date: Fri, 8 Nov 2019 15:46:52 +0800
Subject: [PATCH 04/71] update

---
 src/Directory.Build.props                                 | 2 +-
 src/Library/Infrastructure/Infrastructure.csproj          | 5 +++++
 .../Templates/Default/T4/src/UI/App/Package.cs            | 2 +-
 .../Templates/Default/T4/src/UI/App/Package.tt            | 2 +-
 .../Default/T4/src/UI/App/src/views/index/Index.cs        | 6 +++---
 .../Default/T4/src/UI/App/src/views/index/Index.tt        | 4 ++--
 .../Infrastructure/_modules/CodeGenerator/_module.json    | 2 +-
 src/UI/module-code-generator/package.json                 | 2 +-
 .../module-code-generator/src/views/enum/index/index.vue  | 6 +++---
 .../src/views/project/index/index.vue                     | 8 ++++----
 10 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index e001af3..4549a2d 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
     <Id>CodeGenerator</Id>
     <Name>代码生成器</Name>
     <Authors>Oldli</Authors>
-    <Version>1.5.1</Version>
+    <Version>1.5.2</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 8268259..72574b4 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -686,6 +686,11 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Package.tt</DependentUpon>
     </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Index.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Index.tt</DependentUpon>
+    </Compile>
     <Compile Update="Templates\Default\T4\src\UI\App\VueConfig.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
index 85ed3af..0ad6d71 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
@@ -79,7 +79,7 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(@"-module-admin"": ""^1.0.0""
+            this.Write(@"-module-admin"": ""^1.0.1""
     },
     ""devDependencies"": {
         ""@vue/cli-plugin-babel"": ""^3.11.0"",
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
index 684adce..37ca669 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
@@ -16,7 +16,7 @@
         "cc": "rimraf node_modules/.cache"
     },
     "dependencies": {
-        "<#= _prefix #>-module-admin": "^1.0.0"
+        "<#= _prefix #>-module-admin": "^1.0.1"
     },
     "devDependencies": {
         "@vue/cli-plugin-babel": "^3.11.0",
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
index 72700e8..37e2082 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
@@ -100,15 +100,15 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("-button-has :options=\"buttons.edit\" @click=\"edit(row)\" />\r\n        <");
+            this.Write("-button v-bind=\"buttons.edit\" @click=\"edit(row)\" />\r\n        <");
             
             #line 28 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write("-button-delete :options=\"buttons.del\" :id=\"row.id\" :action=\"removeAction\" @succes" +
-                    "s=\"refresh\"/>\r\n      </template>\r\n    </");
+            this.Write("-button-delete v-bind=\"buttons.del\" :id=\"row.id\" :action=\"removeAction\" @success=" +
+                    "\"refresh\"/>\r\n      </template>\r\n    </");
             
             #line 30 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
index adf664f..2bcb124 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
@@ -24,8 +24,8 @@
 
       <!--操作列-->
       <template v-slot:col-operation="{row}">
-        <<#= _prefix #>-button-has :options="buttons.edit" @click="edit(row)" />
-        <<#= _prefix #>-button-delete :options="buttons.del" :id="row.id" :action="removeAction" @success="refresh"/>
+        <<#= _prefix #>-button v-bind="buttons.edit" @click="edit(row)" />
+        <<#= _prefix #>-button-delete v-bind="buttons.del" :id="row.id" :action="removeAction" @success="refresh"/>
       </template>
     </<#= _prefix #>-list>
 
diff --git a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
index c2b7454..4dde032 100644
--- a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
+++ b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.1"}
+{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.2"}
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index 302096c..a60e448 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -1,6 +1,6 @@
 {
     "name": "netmodular-module-code-generator",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "author": "Oldli",
     "license": "ISC",
     "code": "codeGenerator",
diff --git a/src/UI/module-code-generator/src/views/enum/index/index.vue b/src/UI/module-code-generator/src/views/enum/index/index.vue
index acda316..385dab8 100644
--- a/src/UI/module-code-generator/src/views/enum/index/index.vue
+++ b/src/UI/module-code-generator/src/views/enum/index/index.vue
@@ -13,7 +13,7 @@
 
       <!--按钮-->
       <template v-slot:querybar-buttons>
-        <nm-button-has :options="buttons.add" @click="add" />
+        <nm-button v-bind="buttons.add" @click="add" />
       </template>
 
       <!--配置枚举项-->
@@ -26,8 +26,8 @@
 
       <!--操作列-->
       <template v-slot:col-operation="{row}">
-        <nm-button-has :options="buttons.edi" @click="edit(row)" />
-        <nm-button-delete :options="buttons.del" :action="removeAction" :id="row.id" @success="refresh" />
+        <nm-button v-bind="buttons.edi" @click="edit(row)" />
+        <nm-button-delete v-bind="buttons.del" :action="removeAction" :id="row.id" @success="refresh" />
       </template>
     </nm-list>
 
diff --git a/src/UI/module-code-generator/src/views/project/index/index.vue b/src/UI/module-code-generator/src/views/project/index/index.vue
index 144bce4..072f6fd 100644
--- a/src/UI/module-code-generator/src/views/project/index/index.vue
+++ b/src/UI/module-code-generator/src/views/project/index/index.vue
@@ -13,7 +13,7 @@
 
       <!--按钮-->
       <template v-slot:querybar-buttons>
-        <nm-button-has :options="buttons.add" @click="add" />
+        <nm-button v-bind="buttons.add" @click="add" />
       </template>
 
       <!--是否显示-->
@@ -21,10 +21,10 @@
 
       <!--操作列-->
       <template v-slot:col-operation="{row}">
-        <nm-button-has :options="buttons.edit" @click="edit(row)" />
+        <nm-button v-bind="buttons.edit" @click="edit(row)" />
         <nm-button text="实体" icon="entity" type="text" @click="manageClass(row)" />
-        <nm-button-has :options="buttons.buildCode" @click="buildCode(row)" />
-        <nm-button-delete :options="buttons.del" :action="removeAction" :id="row.id" @success="refresh" />
+        <nm-button v-bind="buttons.buildCode" @click="buildCode(row)" />
+        <nm-button-delete v-bind="buttons.del" :action="removeAction" :id="row.id" @success="refresh" />
       </template>
     </nm-list>
 

From 61eef7975a3a0b648d80778173df60081096c569 Mon Sep 17 00:00:00 2001
From: oldli <wenju1991@163.com>
Date: Mon, 11 Nov 2019 18:10:41 +0800
Subject: [PATCH 05/71] update

---
 src/UI/module-code-generator/package.json                      | 2 +-
 .../src/views/project/components/add/index.vue                 | 3 +++
 .../src/views/project/components/edit/index.vue                | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index a60e448..da88fb5 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -1,6 +1,6 @@
 {
     "name": "netmodular-module-code-generator",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "author": "Oldli",
     "license": "ISC",
     "code": "codeGenerator",
diff --git a/src/UI/module-code-generator/src/views/project/components/add/index.vue b/src/UI/module-code-generator/src/views/project/components/add/index.vue
index 442080b..5cba371 100644
--- a/src/UI/module-code-generator/src/views/project/components/add/index.vue
+++ b/src/UI/module-code-generator/src/views/project/components/add/index.vue
@@ -45,6 +45,9 @@ export default {
           ],
           code: [
             { required: true, message: '请输入编码', trigger: 'blur' }
+          ],
+          copyright: [
+            { required: true, message: '请输入版权声明', trigger: 'blur' }
           ]
         }
       },
diff --git a/src/UI/module-code-generator/src/views/project/components/edit/index.vue b/src/UI/module-code-generator/src/views/project/components/edit/index.vue
index 57ebd56..1f3fb33 100644
--- a/src/UI/module-code-generator/src/views/project/components/edit/index.vue
+++ b/src/UI/module-code-generator/src/views/project/components/edit/index.vue
@@ -45,6 +45,9 @@ export default {
           ],
           code: [
             { required: true, message: '请输入编码', trigger: 'blur' }
+          ],
+          copyright: [
+            { required: true, message: '请输入版权声明', trigger: 'blur' }
           ]
         }
       }

From 6947810e616fa2e9b579f3944c6e39ae36eb965e Mon Sep 17 00:00:00 2001
From: hogan <hejiyong_111@126.com>
Date: Tue, 12 Nov 2019 10:46:04 +0800
Subject: [PATCH 06/71] =?UTF-8?q?update=20ClassBuildModel=20=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E6=8E=A7=E5=88=B6=E5=99=A8=E4=B8=BB=E9=94=AE=E5=92=8C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=AF=B9=E8=B1=A1=E4=B8=BB=E9=94=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Infrastructure/Templates/Models/ClassBuildModel.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Library/Infrastructure/Templates/Models/ClassBuildModel.cs b/src/Library/Infrastructure/Templates/Models/ClassBuildModel.cs
index 1971899..2860d3d 100644
--- a/src/Library/Infrastructure/Templates/Models/ClassBuildModel.cs
+++ b/src/Library/Infrastructure/Templates/Models/ClassBuildModel.cs
@@ -39,10 +39,12 @@ public string PrimaryKeyTypeName
         {
             get
             {
-                var name = BaseEntityType.ToDescription();
-                if (name.Contains("Int")) return "int";
-                if (name.Contains("Long")) return "long";
-                return "Guid";
+                var name = BaseEntityType.ToDescription().ToLower();
+                if (name.Contains("int")) return "int";
+                if (name.Contains("long")) return "long";
+                if (name.Contains("string")) return "string";
+                if (name.Contains("guid")) return "Guid";
+                return "string";
             }
         }
 

From 4d1bf9aab2518cc8fd2423f7a28ae55a8238442d Mon Sep 17 00:00:00 2001
From: OLDLI <wenju1991@163.com>
Date: Tue, 12 Nov 2019 10:58:18 +0800
Subject: [PATCH 07/71] Update ClassBuildModel.cs

---
 src/Library/Infrastructure/Templates/Models/ClassBuildModel.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Library/Infrastructure/Templates/Models/ClassBuildModel.cs b/src/Library/Infrastructure/Templates/Models/ClassBuildModel.cs
index 2860d3d..2f10252 100644
--- a/src/Library/Infrastructure/Templates/Models/ClassBuildModel.cs
+++ b/src/Library/Infrastructure/Templates/Models/ClassBuildModel.cs
@@ -42,7 +42,6 @@ public string PrimaryKeyTypeName
                 var name = BaseEntityType.ToDescription().ToLower();
                 if (name.Contains("int")) return "int";
                 if (name.Contains("long")) return "long";
-                if (name.Contains("string")) return "string";
                 if (name.Contains("guid")) return "Guid";
                 return "string";
             }

From 5a4a3469d9b026a413cd153c9a9a35f98e01b720 Mon Sep 17 00:00:00 2001
From: oldli <wenju1991@163.com>
Date: Tue, 12 Nov 2019 16:29:26 +0800
Subject: [PATCH 08/71] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E7=BB=84=E4=BB=B6=E5=89=8D=E7=BC=80=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=9E=8B=202=E3=80=81=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/SQLite/Nm_Admin.db                       | Bin 618496 -> 618496 bytes
 data/SQLite/Nm_CodeGenerator.db               | Bin 69632 -> 69632 bytes
 .../ProjectService/ProjectService.cs          |   1 +
 .../Infrastructure/Infrastructure.csproj      |  20 ++++++++++++++++++
 .../Options/CodeGeneratorOptions.cs           |   7 +++++-
 .../Default/T4/src/UI/App/Package.cs          |   6 +++---
 .../Default/T4/src/UI/App/Package.tt          |   2 +-
 .../App/src/components/Components.Extend.cs   |   2 ++
 .../src/UI/App/src/components/Components.cs   |   2 +-
 .../src/UI/App/src/components/Components.tt   |   2 +-
 .../UI/App/src/views/components/Add.Extend.cs |   2 ++
 .../T4/src/UI/App/src/views/components/Add.cs |   6 +++---
 .../T4/src/UI/App/src/views/components/Add.tt |   4 ++--
 .../App/src/views/components/Edit.Extend.cs   |   2 ++
 .../src/UI/App/src/views/components/Edit.cs   |   6 +++---
 .../src/UI/App/src/views/components/Edit.tt   |   4 ++--
 .../UI/App/src/views/index/Index.Extend.cs    |   6 +++---
 .../T4/src/UI/App/src/views/index/Index.cs    |  16 +++++++-------
 .../T4/src/UI/App/src/views/index/Index.tt    |  16 +++++++-------
 .../T4/src/WebHost/config/db.Extend.cs        |   4 ++--
 .../Default/T4/src/WebHost/config/db.cs       |   4 ++--
 .../Default/T4/src/WebHost/config/db.tt       |   4 ++--
 .../Templates/Models/ProjectBuildModel.cs     |   5 +++++
 src/UI/module-code-generator/package.json     |   7 +++---
 .../views/project/components/add/index.vue    |  19 +++++++++--------
 .../views/project/components/edit/index.vue   |   2 +-
 src/WebHost/config/module.json                |   4 +++-
 27 files changed, 96 insertions(+), 57 deletions(-)

diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index 0836d30352a565baa766b17680e4aadfc7648008..dcf969dc9e55042a115bc504c156f69aea299d6a 100644
GIT binary patch
delta 21939
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
TzRRp(@x;6jsGEz%&(8ZFZL{a{

delta 206
zcmZp8pxW?2b%Hdn8v_HwbRaeW;{1sk=8SF|6LkC;uW#=4FF(M=$o~r{&d|pHYdhZt
z#y9-if5|hxlM^-2HL_4JG`BJ~urjdJGcq%`Fg7u1|7*v%{jVJp^Th1}2N*xdPh23*
zng`UZ*Us~S35c12m<5PgftYPO&j<D&@f=K?z6{*=IDIz@3OI6Z_l@M(%(m<RqXNVL
IV#xvl0BIaW-v9sr

diff --git a/data/SQLite/Nm_CodeGenerator.db b/data/SQLite/Nm_CodeGenerator.db
index 8106d7c34ec04350005077745bae83778ac0c395..945a9bc8fd782a2510239747cd04d8d779755474 100644
GIT binary patch
delta 2051
zcma)-&1(}|7{+Isq?u5gv7%_H(5R^v(-Y1)bG}B3Wj?`$px|&fejqkNzz-<d2tupi
z$5PG3Ubvg!;%)>*d%0j;xOE|dyW&!8wcgGB54`70k{Xjq>}&#a-Y~!Sd7t+=OO5nW
zBmH1PFFoAvWlCC^6kg0X%w5^+f|ma<`gq50BNMrg#$VZmm9d>?v$MBRc25*V6Gr?*
z#<-p{yvU0zJ47711aRg<fE=FzmthBln7M+&FobSU-}${*+A4&MVjvt501ILam<KUM
z1d#x`-t}v>%C%a3bh3DG{qCLhXRn4aL^ePOAY4H7n1zo~R%WuEFkZhfcXW5c39p}@
zo07o83V5&N9WsmrV9T>82q?Be5c&j!4s!hvg+ws1ZQwK2+Lem-HU{2k+}nKeN2Uju
zpfV%2MMw<1rvtcsLXm8xID7keMiEaLIbA|W#+2m#Nn*&D3n;Wa;8~mifduq@61o=0
zlHf?WIfw!Jp1eL^y<Dx#pQ&E0<P`Mu=Qqzbet)&G{Lkj{->H9l*fB2)VL^taq@_;u
ztpn0Tx6=y!KpTBB5uGFG0xoP9KuTQV!9c!=(Py@e?%psI_~9n_=hfBJx4zVfDvKmx
zBQ*=D_-smHA8KPO#hp%5$BM(y7l4Hv0x37-1QQ%^rW6Oi#P${{7i*n@uiyW3{q<@~
z@Xh|{ioDa@ZNX8~++s+9Pqx96^~Tf*<nCA&@St!gqYzuZtH4X!1#ihc)x=hEf9=Z*
z`<Vo`OfsV@=&@YO-{VGCgv4r#0C@mAp$&Y;Cy<5~4ZT?H;xD03%%_w&>Nh8MBurhd
zdLKVf9uqz)q<3ZWpEUEX`P?MtIdjb%$$wfIE4<4uKR5O4ViRCM(q*Spk-n950}^KV
zr@{e?o#`lCBp|L#-lKF!WvejRxvAd5WTy-rNkzG>ZXg?%@sm8BmoU9Fteg8ZbDxwe
zZ{k}OeMH_C6Z*IpIX^Cm0okN77di{I>ZL1{)=y^R@x3ok8;ORaSRmeW1*k1iCu-0|
zIZny6rkQIiW2fGmxT~AKx6r7jX}US1nKQDNgXZF`)2f%8e7e%uA;1rOA7Gbrz+J}`
z9-($9><-QPekG|Zn?P<+BL5DB7y43c=!5#zx&2*kj_YIu^)@-()ns49C;t`x2T#1<
A<NyEw

delta 863
zcma))PiqrF7>6e{$}T2MbEq`cVk!xGaFY4IJ3*+svoqkO=wZ&K(9)AAr58akUc`$~
z-GkTEgC1+m(J$at@Zc9H1y6nho!zR5!ARcAz{@+#^Sr+q46B1-_26=4<>eK9eg$-w
zKOJumVE`5Zs2|o3M{BLu_5Q-9b8aap%LUCa47AgZDT}o=8X24!#HnS7T0)T((oilG
zSCPsWf3$D>8dQiYoT6A+g8T$UDUGru(KfY8Z*1M)$w{-lc5?9I^xb=ki9!S;LR$p)
ziRg3M#Y{0qWxl!2YU2ive4~8}fJ)CpHo~ytF+F7P7i94^Wyo5dAR(+k#&CwIl?gRj
z@$U6`An$CSD`xY@S8Gdu*hrttu24)xGA`IIjvFd}y4-oys+Q}7NAPIWxce4v+?!`}
z3jl!0&CR6$fUAQGMPBgIsBs&@-Z$q~SHtE+ME~7<5fRZ_`#ZZ2_8$E{Po6(JJ^nbA
z!kL)Fk&H;0!nhHaDR|X0lCNI$Gwe<B&rH7VMN9mf9=`*hd~q)HHHFU<$|w`ann)mu
z(^M15u{Fs&x&6yS63Hl*#r0U*48{HzqsWUrT)$Q;#mWg){I~X$SZ7jfCfS?st)F6@
B%2NOU

diff --git a/src/Library/Application/ProjectService/ProjectService.cs b/src/Library/Application/ProjectService/ProjectService.cs
index 01752e1..5e89124 100644
--- a/src/Library/Application/ProjectService/ProjectService.cs
+++ b/src/Library/Application/ProjectService/ProjectService.cs
@@ -143,6 +143,7 @@ public async Task<IResultModel<ProjectBuildCodeResultModel>> BuildCode(Guid proj
             var projectBuildModel = _mapper.Map<ProjectBuildModel>(project);
 
             projectBuildModel.Prefix = _codeGeneratorOptions.Prefix;
+            projectBuildModel.UIPrefix = _codeGeneratorOptions.UIPrefix;
 
             var id = Guid.NewGuid().ToString();
             var rootPath = Path.Combine(_commonOptions.TempPath, _codeGeneratorOptions.BuildCodePath);
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 72574b4..6fe0746 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -686,6 +686,21 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Package.tt</DependentUpon>
     </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\src\components\Components.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Components.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\src\views\components\Add.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Add.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\src\views\components\Edit.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Edit.tt</DependentUpon>
+    </Compile>
     <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Index.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -696,6 +711,11 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>VueConfig.tt</DependentUpon>
     </Compile>
+    <Compile Update="Templates\Default\T4\src\WebHost\config\db.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>db.tt</DependentUpon>
+    </Compile>
     <Compile Update="Templates\Default\T4\src\WebHost\Csproj.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
diff --git a/src/Library/Infrastructure/Options/CodeGeneratorOptions.cs b/src/Library/Infrastructure/Options/CodeGeneratorOptions.cs
index d12f590..5c400d7 100644
--- a/src/Library/Infrastructure/Options/CodeGeneratorOptions.cs
+++ b/src/Library/Infrastructure/Options/CodeGeneratorOptions.cs
@@ -15,8 +15,13 @@ public CodeGeneratorOptions()
         public string BuildCodePath { get; set; }
 
         /// <summary>
-        /// 前缀
+        /// 项目前缀
         /// </summary>
         public string Prefix { get; set; }
+
+        /// <summary>
+        /// 前端UI组件前缀
+        /// </summary>
+        public string UIPrefix { get; set; }
     }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
index 0ad6d71..0fa7bed 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
@@ -29,14 +29,14 @@ public virtual string TransformText()
             this.Write("{\r\n    \"name\": \"");
             
             #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write("-");
+            this.Write("-module-");
             
             #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.WebUIDicName));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
index 37ca669..9d1633f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
@@ -1,7 +1,7 @@
 <#@ template language="C#" #>
 <#@ import namespace="NetModular.Lib.Utils.Core.Extensions" #>
 {
-    "name": "<#= _model.Project.Code.ToLower() #>-<#= _model.Project.WebUIDicName #>",
+    "name": "<#= _prefix #>-module-<#= _model.Project.Code.ToLower() #>",
     "version": "1.0.0",
     "code": "<#= _model.Project.Code.FirstCharToLower() #>",
     "title": "<#= _model.Project.Name #>",
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
index 43b150c..ff3d4ee 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
@@ -7,11 +7,13 @@ public partial class Components : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
         private readonly string _prefix;
+        private readonly string _uiPrefix;
 
         public Components(TemplateBuildModel model)
         {
             _model = model;
             _prefix = _model.Project.Prefix.ToLower();
+            _uiPrefix = _model.Project.UIPrefix.ToLower();
         }
 
         public void Save()
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.cs
index 06fc889..3dd0de4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.cs
@@ -29,7 +29,7 @@ public virtual string TransformText()
                     "/dictionary/select\'\r\n//\r\n// export default [{\r\n// //�������\r\n// name: \'");
             
             #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\components\Components.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.tt
index 2a3484a..177fb43 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.tt
@@ -6,7 +6,7 @@ export default []
 //
 // export default [{
 // //�������
-// name: '<#= _prefix #>-dictionary-select',
+// name: '<#= _uiPrefix #>-dictionary-select',
 // //�������
 // component: DictionarySelect
 // }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.Extend.cs
index ffbf424..8ce8287 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.Extend.cs
@@ -10,11 +10,13 @@ public partial class Add : ITemplateHandler
         private readonly TemplateBuildModel _model;
         private ClassBuildModel _class;
         private readonly string _prefix;
+        private readonly string _uiPrefix;
 
         public Add(TemplateBuildModel model)
         {
             _model = model;
             _prefix = _model.Project.Prefix.ToLower();
+            _uiPrefix = _model.Project.UIPrefix.ToLower();
         }
 
         public void Save()
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.cs
index ac218c4..176e2d7 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.cs
@@ -26,10 +26,10 @@ public partial class Add : AddBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("<template>\r\n<");
+            this.Write("<template>\r\n  <");
             
             #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
@@ -72,7 +72,7 @@ public virtual string TransformText()
             this.Write("      </el-col>\r\n    </el-row>\r\n  </");
             
             #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.tt
index 9791a1c..fad43c0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.tt
@@ -1,7 +1,7 @@
 <#@ template language="C#" #>
 <#@ import namespace="NetModular.Lib.Utils.Core.Extensions" #>
 <template>
-<<#= _prefix #>-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
+  <<#= _uiPrefix #>-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
     <el-row>
       <el-col :span="20" :offset="1">
 <#    foreach(var p in _class.AddModelPropertyList){ #>
@@ -11,7 +11,7 @@
 <#    } #>
       </el-col>
     </el-row>
-  </<#= _prefix #>-form-dialog>
+  </<#= _uiPrefix #>-form-dialog>
 </template>
 <script>
 import { mixins } from '<#= _prefix.ToLower() #>-ui'
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.Extend.cs
index dd84ef9..68afc47 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.Extend.cs
@@ -10,11 +10,13 @@ public partial class Edit : ITemplateHandler
         private readonly TemplateBuildModel _model;
         private ClassBuildModel _class;
         private readonly string _prefix;
+        private readonly string _uiPrefix;
 
         public Edit(TemplateBuildModel model)
         {
             _model = model;
             _prefix = _model.Project.Prefix.ToLower();
+            _uiPrefix = _model.Project.UIPrefix.ToLower();
         }
 
         public void Save()
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.cs
index 4e8e292..bf7501a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.cs
@@ -26,10 +26,10 @@ public partial class Edit : EditBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("<template>\r\n<");
+            this.Write("<template>\r\n  <");
             
             #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
@@ -72,7 +72,7 @@ public virtual string TransformText()
             this.Write("      </el-col>\r\n    </el-row>\r\n  </");
             
             #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.tt
index 6b48787..dfb0c3e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.tt
@@ -1,7 +1,7 @@
 <#@ template language="C#" #>
 <#@ import namespace="NetModular.Lib.Utils.Core.Extensions" #>
 <template>
-<<#= _prefix #>-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
+  <<#= _uiPrefix #>-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
     <el-row>
       <el-col :span="20" :offset="1">
 <#    foreach(var p in _class.EditModelPropertyList){ #>
@@ -11,7 +11,7 @@
 <#    } #>
       </el-col>
     </el-row>
-  </<#= _prefix #>-form-dialog>
+  </<#= _uiPrefix #>-form-dialog>
 </template>
 <script>
 import { mixins } from '<#= _prefix.ToLower() #>-ui'
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
index a12810c..2e27afa 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
@@ -9,12 +9,12 @@ public partial class Index : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
         private ClassBuildModel _class;
-        private readonly string _prefix;
+        private readonly string _uiPrefix;
 
         public Index(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = _model.Project.Prefix.ToLower();
+            _uiPrefix = _model.Project.UIPrefix.ToLower();
         }
 
         public void Save()
@@ -34,7 +34,7 @@ public void Save()
 
                     var content = TransformText();
 
-                    var filePath = Path.Combine(dir, $"index.vue");
+                    var filePath = Path.Combine(dir, "index.vue");
                     File.WriteAllText(filePath, content);
                 }
             }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
index 37e2082..08a5c85 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
@@ -29,14 +29,14 @@ public virtual string TransformText()
             this.Write("<template>\r\n  <");
             
             #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
             this.Write("-container>\r\n    <");
             
             #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
@@ -80,7 +80,7 @@ public virtual string TransformText()
                     "       <");
             
             #line 17 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
@@ -88,7 +88,7 @@ public virtual string TransformText()
                     "--�Զ�����-->\r\n      <!-- <template v-slot:col-name=\"{row}\">\r\n        <");
             
             #line 22 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
@@ -96,14 +96,14 @@ public virtual string TransformText()
                     ">\r\n      <template v-slot:col-operation=\"{row}\">\r\n        <");
             
             #line 27 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
             this.Write("-button v-bind=\"buttons.edit\" @click=\"edit(row)\" />\r\n        <");
             
             #line 28 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
@@ -111,7 +111,7 @@ public virtual string TransformText()
                     "\"refresh\"/>\r\n      </template>\r\n    </");
             
             #line 30 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
@@ -120,7 +120,7 @@ public virtual string TransformText()
                     "success=\"refresh\"/>\r\n  </");
             
             #line 36 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
index 2bcb124..dc00a33 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
@@ -1,8 +1,8 @@
 <#@ template language="C#" #>
 <#@ import namespace="NetModular.Lib.Utils.Core.Extensions" #>
 <template>
-  <<#= _prefix #>-container>
-    <<#= _prefix #>-list ref="list" v-bind="list">
+  <<#= _uiPrefix #>-container>
+    <<#= _uiPrefix #>-list ref="list" v-bind="list">
       <!--查询条件-->
       <template v-slot:querybar>
 <#    foreach(var p in _class.QueryModelPropertyList){ #>
@@ -14,26 +14,26 @@
 
       <!--按钮-->
       <template v-slot:querybar-buttons>
-        <<#= _prefix #>-button-has :options="buttons.add" @click="add" />
+        <<#= _uiPrefix #>-button-has :options="buttons.add" @click="add" />
       </template>
 
       <!--自定义列-->
       <!-- <template v-slot:col-name="{row}">
-        <<#= _prefix #>-button :text="row.name" type="text" />
+        <<#= _uiPrefix #>-button :text="row.name" type="text" />
       </template> -->
 
       <!--操作列-->
       <template v-slot:col-operation="{row}">
-        <<#= _prefix #>-button v-bind="buttons.edit" @click="edit(row)" />
-        <<#= _prefix #>-button-delete v-bind="buttons.del" :id="row.id" :action="removeAction" @success="refresh"/>
+        <<#= _uiPrefix #>-button v-bind="buttons.edit" @click="edit(row)" />
+        <<#= _uiPrefix #>-button-delete v-bind="buttons.del" :id="row.id" :action="removeAction" @success="refresh"/>
       </template>
-    </<#= _prefix #>-list>
+    </<#= _uiPrefix #>-list>
 
     <!--添加-->
     <add-page :visible.sync="dialog.add" @success="refresh"/>
     <!--编辑-->
     <edit-page :id="curr.id" :visible.sync="dialog.edit" @success="refresh"/>
-  </<#= _prefix #>-container>
+  </<#= _uiPrefix #>-container>
 </template>
 <script>
 import page from './page'
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
index 6127903..039a57b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
@@ -6,12 +6,12 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     public partial class db : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
-        private readonly string _prefix;
+        private readonly string _dbPrefix;
 
         public db(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _dbPrefix = model.Project.UIPrefix;
         }
 
         public void Save()
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
index 24471ed..53394e0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
@@ -51,7 +51,7 @@ public virtual string TransformText()
       ""Database"": """);
             
             #line 25 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_dbPrefix));
             
             #line default
             #line hidden
@@ -65,7 +65,7 @@ public virtual string TransformText()
             this.Write("\",\r\n      \"Database\": \"");
             
             #line 29 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_dbPrefix));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.tt
index 3e7229f..7af0cf3 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.tt
@@ -22,11 +22,11 @@
       //ģ������
       "Name": "Admin",
       //���ݿ�����
-      "Database": "<#= _prefix #>_Admin"
+      "Database": "<#= _dbPrefix #>_Admin"
     },
     {
       "Name": "<#= _model.Project.Code #>",
-      "Database": "<#= _prefix #>_<#= _model.Project.Code #>"
+      "Database": "<#= _dbPrefix #>_<#= _model.Project.Code #>"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Models/ProjectBuildModel.cs b/src/Library/Infrastructure/Templates/Models/ProjectBuildModel.cs
index 2b6ca73..2ed374d 100644
--- a/src/Library/Infrastructure/Templates/Models/ProjectBuildModel.cs
+++ b/src/Library/Infrastructure/Templates/Models/ProjectBuildModel.cs
@@ -22,6 +22,11 @@ public class ProjectBuildModel
         /// </summary>
         public string Prefix { get; set; }
 
+        /// <summary>
+        /// 前端组件前缀
+        /// </summary>
+        public string UIPrefix { get; set; }
+
         /// <summary>
         /// 编码
         /// </summary>
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index da88fb5..527a9b6 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -18,8 +18,7 @@
         "pub": "cd ../../../script && npm_publish.ps1"
     },
     "dependencies": {
-        "netmodular-module-admin": "^1.0.1",
-        "netmodular-ui": "^1.0.4"
+        "netmodular-module-admin": "^1.0.2"
     },
     "devDependencies": {
         "@vue/cli-plugin-babel": "^3.10.0",
@@ -34,9 +33,9 @@
         "eslint-plugin-vue": "^5.2.3",
         "fibers": "^4.0.1",
         "rimraf": "^3.0.0",
-        "sass": "^1.22.10",
+        "sass": "^1.23.3",
         "sass-loader": "^7.2.0",
         "terser-webpack-plugin": "^2.2.1",
         "vue-template-compiler": "^2.6.10"
     }
-}
\ No newline at end of file
+}
diff --git a/src/UI/module-code-generator/src/views/project/components/add/index.vue b/src/UI/module-code-generator/src/views/project/components/add/index.vue
index 5cba371..b6cc872 100644
--- a/src/UI/module-code-generator/src/views/project/components/add/index.vue
+++ b/src/UI/module-code-generator/src/views/project/components/add/index.vue
@@ -3,10 +3,15 @@
     <el-row>
       <el-col :span="20" :offset="1">
         <el-form-item label="名称：" prop="name">
-          <el-input v-model="form.model.name" />
+          <el-input autofocus v-model="form.model.name" />
         </el-form-item>
         <el-form-item label="编号：" prop="no">
           <el-input v-model.number="form.model.no" />
+          <nm-txt type="warning">
+            当前项目启动端口号为：后端{{ 6220 + form.model.no }}，后端{{
+              5220 + form.model.no
+            }}
+          </nm-txt>
         </el-form-item>
         <el-form-item label="编码：" prop="code">
           <el-input v-model="form.model.code" />
@@ -19,7 +24,7 @@
   </nm-form-dialog>
 </template>
 <script>
-import { mixins } from 'netmodular-ui'
+import { mixins } from 'netmodular-ui';
 
 const api = $api.codeGenerator.project
 
@@ -32,7 +37,7 @@ export default {
         icon: 'add',
         width: '30%',
         action: api.add,
-        labelWidth: '70px',
+        labelWidth: '120px',
         model: {
           name: '',
           no: 0,
@@ -40,12 +45,8 @@ export default {
           copyright: ''
         },
         rules: {
-          name: [
-            { required: true, message: '请输入名称', trigger: 'blur' }
-          ],
-          code: [
-            { required: true, message: '请输入编码', trigger: 'blur' }
-          ],
+          name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+          code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
           copyright: [
             { required: true, message: '请输入版权声明', trigger: 'blur' }
           ]
diff --git a/src/UI/module-code-generator/src/views/project/components/edit/index.vue b/src/UI/module-code-generator/src/views/project/components/edit/index.vue
index 1f3fb33..a03b657 100644
--- a/src/UI/module-code-generator/src/views/project/components/edit/index.vue
+++ b/src/UI/module-code-generator/src/views/project/components/edit/index.vue
@@ -32,7 +32,7 @@ export default {
         title: '编辑项目',
         width: '30%',
         action: api.update,
-        labelWidth: '70px',
+        labelWidth: '120px',
         model: {
           name: '',
           no: 0,
diff --git a/src/WebHost/config/module.json b/src/WebHost/config/module.json
index 857d615..17f2831 100644
--- a/src/WebHost/config/module.json
+++ b/src/WebHost/config/module.json
@@ -13,6 +13,8 @@
   //代码生成器
   "CodeGenerator": {
     //项目前缀
-    "Prefix": "NetModular"
+    "Prefix": "NetModular",
+    //前端组件前缀
+    "UIPrefix": "Nm" 
   } 
 }
\ No newline at end of file

From fbf123ade3d0bc4b042448d82ccfd64f9b490d14 Mon Sep 17 00:00:00 2001
From: oldli <wenju1991@163.com>
Date: Thu, 14 Nov 2019 13:16:16 +0800
Subject: [PATCH 09/71] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/SQLite/Nm_Admin.db                       | Bin 618496 -> 647168 bytes
 data/SQLite/Nm_CodeGenerator.db               | Bin 69632 -> 86016 bytes
 src/Directory.Build.props                     |   2 +-
 src/Library/Application/Application.csproj    |   2 +-
 .../ProjectService/ProjectService.cs          |   5 +-
 src/Library/Domain/Domain.csproj              |   4 +-
 .../Infrastructure/Infrastructure.csproj      |  71 +---
 .../Default/DefaultTemplateBuilder.cs         |   9 +-
 .../Default/T4/Gitattributes.Extend.cs        |   2 +-
 .../Templates/Default/T4/Gitignore.Extend.cs  |   2 +-
 .../Templates/Default/T4/Readme.Extend.cs     |   2 +-
 .../Templates/Default/T4/Solution.Extend.cs   |   2 +-
 .../T4/build/ModuleBuildTargets.Extend.cs     |   2 +-
 .../T4/src/DirectoryBuildProps.Extend.cs      |   2 +-
 .../src/Library/Application/Csproj.Extend.cs  |   2 +-
 .../Application/MapperConfig.Extend.cs        |   2 +-
 .../Library/Application/ServiceImpl.Extend.cs |   2 +-
 .../Application/ServiceInterface.Extend.cs    |   2 +-
 .../Application/ViewModels/AddModel.Extend.cs |   2 +-
 .../ViewModels/UpdateModel.Extend.cs          |   2 +-
 .../T4/src/Library/Domain/Csproj.Extend.cs    |   2 +-
 .../T4/src/Library/Domain/Entity.Extend.cs    |   2 +-
 .../src/Library/Domain/EntityExtend.Extend.cs |   2 +-
 .../Domain/Models/QueryModel.Extend.cs        |   2 +-
 .../src/Library/Domain/Repository.Extend.cs   |   2 +-
 .../Library/Infrastructure/Csproj.Extend.cs   |   2 +-
 .../Options/ModuleOptionsConfigure.Extend.cs  |   2 +-
 .../Infrastructure/Options/Options.Extend.cs  |   2 +-
 .../Repositories/DbContext.Extend.cs          |   2 +-
 .../Repositories/MySqlRepository.Extend.cs    |   2 +-
 .../Repositories/SQLiteRepository.Extend.cs   |   2 +-
 .../SqlServerRepository.Extend.cs             |   2 +-
 .../T4/src/UI/App/BabelConfig.Extend.cs       |   2 +-
 .../T4/src/UI/App/Browserslistrc.Extend.cs    |   2 +-
 .../T4/src/UI/App/EditorConfig.Extend.cs      |   2 +-
 .../Default/T4/src/UI/App/Eslintrc.Extend.cs  |   2 +-
 .../Default/T4/src/UI/App/Package.Extend.cs   |   2 +-
 .../T4/src/UI/App/PostcssConfig.Extend.cs     |   4 +-
 .../T4/src/UI/App/Prettierrc.Extend.cs        |  26 ++
 .../Default/T4/src/UI/App/Prettierrc.cs       | 308 ++++++++++++++++++
 .../Default/T4/src/UI/App/Prettierrc.tt       |   7 +
 .../Default/T4/src/UI/App/VueConfig.Extend.cs |   2 +-
 .../Default/T4/src/UI/App/src/Index.Extend.cs |   2 +-
 .../Default/T4/src/UI/App/src/Main.Extend.cs  |   2 +-
 .../T4/src/UI/App/src/Module.Extend.cs        |   2 +-
 .../T4/src/UI/App/src/api/Index.Extend.cs     |   2 +-
 .../App/src/api/components/Entity.Extend.cs   |   2 +-
 .../App/src/components/Components.Extend.cs   |   2 +-
 .../T4/src/UI/App/src/config/Config.Extend.cs |   2 +-
 .../T4/src/UI/App/src/routes/Routes.Extend.cs |   2 +-
 .../T4/src/UI/App/src/store/Store.Extend.cs   |   2 +-
 .../UI/App/src/views/components/Add.Extend.cs |   2 +-
 .../App/src/views/components/Edit.Extend.cs   |   2 +-
 .../src/UI/App/src/views/index/Cols.Extend.cs |   2 +-
 .../UI/App/src/views/index/Index.Extend.cs    |   2 +-
 .../src/UI/App/src/views/index/Page.Extend.cs |   2 +-
 .../T4/src/UI/App/vscode/settings.Extend.cs   |   2 +-
 .../Default/T4/src/UI/App/vscode/settings.cs  |  25 +-
 .../Default/T4/src/UI/App/vscode/settings.tt  |  26 +-
 .../src/Web/Controllers/Controller.Extend.cs  |   2 +-
 .../Default/T4/src/Web/Csproj.Extend.cs       |   2 +-
 .../T4/src/Web/ModuleController.Extend.cs     |   2 +-
 .../T4/src/Web/ModuleInitializer.Extend.cs    |   2 +-
 .../Default/T4/src/WebHost/Csproj.Extend.cs   |   2 +-
 .../Default/T4/src/WebHost/Program.Extend.cs  |   2 +-
 .../Default/T4/src/WebHost/Startup.Extend.cs  |   2 +-
 .../T4/src/WebHost/config/cache.Extend.cs     |   2 +-
 .../WebHost/config/cacheDevelopment.Extend.cs |   2 +-
 .../T4/src/WebHost/config/db.Extend.cs        |   2 +-
 .../WebHost/config/dbDevelopment.Extend.cs    |   2 +-
 .../T4/src/WebHost/config/host.Extend.cs      |   2 +-
 .../WebHost/config/hostDevelopment.Extend.cs  |   2 +-
 .../T4/src/WebHost/config/jwt.Extend.cs       |   2 +-
 .../WebHost/config/jwtDevelopment.Extend.cs   |   2 +-
 .../T4/src/WebHost/config/logging.Extend.cs   |   2 +-
 .../config/loggingDevelopment.Extend.cs       |   2 +-
 .../T4/src/WebHost/config/module.Extend.cs    |   2 +-
 .../config/moduleDevelopment.Extend.cs        |   2 +-
 .../Templates/TemplateBuilderAbstract.cs      |   5 +-
 .../_modules/CodeGenerator/_module.json       |   2 +-
 src/UI/module-code-generator/.prettierrc      |   6 +
 .../.vscode/settings.json                     |  25 +-
 src/UI/module-code-generator/package.json     |   4 +-
 .../src/views/enum/index/index.vue            |  12 +-
 .../src/views/enum/index/page.js              |   6 +
 .../views/project/components/add/index.vue    |  12 +-
 .../src/views/property/index/index.vue        |  15 +-
 src/WebHost/WebHost.csproj                    |   6 +-
 88 files changed, 464 insertions(+), 246 deletions(-)
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.Extend.cs
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.cs
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.tt
 create mode 100644 src/UI/module-code-generator/.prettierrc

diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index dcf969dc9e55042a115bc504c156f69aea299d6a..dfc775b255ce68278fd4070835ca31760b330321 100644
GIT binary patch
delta 6199
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

delta 25877
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

diff --git a/data/SQLite/Nm_CodeGenerator.db b/data/SQLite/Nm_CodeGenerator.db
index 945a9bc8fd782a2510239747cd04d8d779755474..d4ab4f84c9fae9651e7e33d37c89496d0136c67e 100644
GIT binary patch
literal 86016
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

delta 228
zcmZozz}m2YWr8%THUk5L;6w#`M(vFW3;4x&fn0X>A_l&TywiBXxurR8aV%pm+MK8m
z!#>?xkZ~&`+jK@DMvut}vK$<yW_o6(h9)M{52`S#aWomSiH3%Ticjx1VicWxL}CUb
z>*N?ou*%7~k{pbt(+h1G)wbW3WK?CF)W9Od&i9Cczm0!AzX^XV{|$a_zDJt{9nSDg
zU(e6TKDk$1aWj|xFNeh}0ScR00+<w7BpCQ5fC~8dCrj*qvzevgF8^dRdHG2fSlAf(
Ybr|?{fO1OwlXdRj0LyKD_+DNC0Be~*F8}}l

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 4549a2d..0a69b4f 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
     <Id>CodeGenerator</Id>
     <Name>代码生成器</Name>
     <Authors>Oldli</Authors>
-    <Version>1.5.2</Version>
+    <Version>1.5.3</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index d6026e9..1047f63 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.1" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.5.0" />
   </ItemGroup>
   
diff --git a/src/Library/Application/ProjectService/ProjectService.cs b/src/Library/Application/ProjectService/ProjectService.cs
index 5e89124..f452919 100644
--- a/src/Library/Application/ProjectService/ProjectService.cs
+++ b/src/Library/Application/ProjectService/ProjectService.cs
@@ -147,9 +147,10 @@ public async Task<IResultModel<ProjectBuildCodeResultModel>> BuildCode(Guid proj
 
             var id = Guid.NewGuid().ToString();
             var rootPath = Path.Combine(_commonOptions.TempPath, _codeGeneratorOptions.BuildCodePath);
+            var moduleFullName = $"{_codeGeneratorOptions.Prefix}.Module.{project.Code}";
             var buildModel = new TemplateBuildModel
             {
-                RootPath = Path.Combine(rootPath, id),
+                RootPath = Path.Combine(rootPath, id, moduleFullName),
             };
 
             if (classList == null)
@@ -231,7 +232,7 @@ public async Task<IResultModel<ProjectBuildCodeResultModel>> BuildCode(Guid proj
             var builder = new DefaultTemplateBuilder();
             builder.Build(buildModel);
 
-            ZipFile.CreateFromDirectory(buildModel.RootPath, Path.Combine(rootPath, id + ".zip"));
+            ZipFile.CreateFromDirectory(Path.Combine(rootPath, id), Path.Combine(rootPath, id + ".zip"));
 
             var resultModel = new ProjectBuildCodeResultModel
             {
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 08a1105..0c86573 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.5.0" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.5.1" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.1" />
     <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.5.0" />
   </ItemGroup>
   
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 6fe0746..b2b159b 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -296,6 +296,10 @@
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>Index.cs</LastGenOutput>
     </None>
+    <None Update="Templates\Default\T4\src\UI\App\Prettierrc.tt">
+      <Generator>TextTemplatingFilePreprocessor</Generator>
+      <LastGenOutput>Prettierrc.cs</LastGenOutput>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
@@ -663,73 +667,10 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Entity.tt</DependentUpon>
     </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Templates\Default\T4\src\Library\Application\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Domain\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\Package.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Package.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\components\Components.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Components.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\components\Add.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Add.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\components\Edit.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Edit.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Index.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Index.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\VueConfig.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>VueConfig.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\db.cs">
+    <Compile Update="Templates\Default\T4\src\UI\App\Prettierrc.*">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>db.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Web\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Web\ModuleInitializer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ModuleInitializer.tt</DependentUpon>
+      <DependentUpon>Prettierrc.tt</DependentUpon>
     </Compile>
   </ItemGroup>
 
diff --git a/src/Library/Infrastructure/Templates/Default/DefaultTemplateBuilder.cs b/src/Library/Infrastructure/Templates/Default/DefaultTemplateBuilder.cs
index 140cb7f..3479dec 100644
--- a/src/Library/Infrastructure/Templates/Default/DefaultTemplateBuilder.cs
+++ b/src/Library/Infrastructure/Templates/Default/DefaultTemplateBuilder.cs
@@ -1,6 +1,4 @@
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default
 {
     public class DefaultTemplateBuilder : TemplateBuilderAbstract
     {
@@ -8,10 +6,5 @@ public DefaultTemplateBuilder() : base("Default")
         {
 
         }
-
-        public override void Build(TemplateBuildModel model)
-        {
-            base.Build(model);
-        }
     }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Gitattributes.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/Gitattributes.Extend.cs
index 1b767c6..bd041bd 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Gitattributes.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Gitattributes.Extend.cs
@@ -15,7 +15,7 @@ public Gitattributes(TemplateBuildModel model)
         public void Save()
         {
             var content = TransformText();
-            var filePath = Path.Combine(_model.RootPath, _model.Project.Code, ".gitattributes");
+            var filePath = Path.Combine(_model.RootPath, ".gitattributes");
             File.WriteAllText(filePath, content);
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Gitignore.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/Gitignore.Extend.cs
index 62592df..7726704 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Gitignore.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Gitignore.Extend.cs
@@ -15,7 +15,7 @@ public Gitignore(TemplateBuildModel model)
         public void Save()
         {
             var content = TransformText();
-            var filePath = Path.Combine(_model.RootPath, _model.Project.Code, ".gitignore");
+            var filePath = Path.Combine(_model.RootPath, ".gitignore");
             File.WriteAllText(filePath, content);
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Readme.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/Readme.Extend.cs
index 09c6270..72f9db0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Readme.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Readme.Extend.cs
@@ -15,7 +15,7 @@ public Readme(TemplateBuildModel model)
         public void Save()
         {
             var content = TransformText();
-            var filePath = Path.Combine(_model.RootPath, _model.Project.Code, "README.md");
+            var filePath = Path.Combine(_model.RootPath, "README.md");
             File.WriteAllText(filePath, content);
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Solution.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/Solution.Extend.cs
index 0d319c8..ba934a9 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Solution.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Solution.Extend.cs
@@ -15,7 +15,7 @@ public Solution(TemplateBuildModel model)
         public void Save()
         {
             var content = TransformText();
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code);
+            var dir = Path.Combine(_model.RootPath);
             if (!Directory.Exists(dir))
             {
                 Directory.CreateDirectory(dir);
diff --git a/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.Extend.cs
index 3d10c22..c21bbe3 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.Extend.cs
@@ -14,7 +14,7 @@ public ModuleBuildTargets(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "build");
+            var dir = Path.Combine(_model.RootPath, "build");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs
index 7c3488b..970c9a2 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs
@@ -16,7 +16,7 @@ public DirectoryBuildProps(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src");
+            var dir = Path.Combine(_model.RootPath, "src");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs
index 5a003da..9407f0d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs
@@ -15,7 +15,7 @@ public Csproj(TemplateBuildModel model)
         }
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Application");
+            var dir = Path.Combine(_model.RootPath, "src/Library/Application");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.Extend.cs
index 84142d3..23bf3f6 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.Extend.cs
@@ -24,7 +24,7 @@ public void Save()
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Application", _class.Name + "Service");
+                    var dir = Path.Combine(_model.RootPath, "src/Library/Application", _class.Name + "Service");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.Extend.cs
index 9a7e211..327077e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.Extend.cs
@@ -24,7 +24,7 @@ public void Save()
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Application", _class.Name + "Service");
+                    var dir = Path.Combine(_model.RootPath, "src/Library/Application", _class.Name + "Service");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.Extend.cs
index e04477d..d341de0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.Extend.cs
@@ -24,7 +24,7 @@ public void Save()
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Application", _class.Name + "Service");
+                    var dir = Path.Combine(_model.RootPath, "src/Library/Application", _class.Name + "Service");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.Extend.cs
index 6d701dc..e709d9b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.Extend.cs
@@ -24,7 +24,7 @@ public void Save()
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Application/", _class.Name + "Service", "ViewModels");
+                    var dir = Path.Combine(_model.RootPath, "src/Library/Application/", _class.Name + "Service", "ViewModels");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.Extend.cs
index 477ebed..76e9fe2 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.Extend.cs
@@ -24,7 +24,7 @@ public void Save()
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Application/", _class.Name + "Service", "ViewModels");
+                    var dir = Path.Combine(_model.RootPath, "src/Library/Application/", _class.Name + "Service", "ViewModels");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs
index 976bb2f..0e49cc6 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs
@@ -16,7 +16,7 @@ public Csproj(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Domain");
+            var dir = Path.Combine(_model.RootPath, "src/Library/Domain");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.Extend.cs
index 793298e..23ce4e1 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.Extend.cs
@@ -35,7 +35,7 @@ public void Save()
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Domain", _class.Name);
+                    var dir = Path.Combine(_model.RootPath, "src/Library/Domain", _class.Name);
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.Extend.cs
index 051a004..9959d93 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.Extend.cs
@@ -24,7 +24,7 @@ public void Save()
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Domain", _class.Name);
+                    var dir = Path.Combine(_model.RootPath, "src/Library/Domain", _class.Name);
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.Extend.cs
index 7e279ea..c253cac 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.Extend.cs
@@ -27,7 +27,7 @@ public void Save()
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Domain", _class.Name, "Models");
+                    var dir = Path.Combine(_model.RootPath, "src/Library/Domain", _class.Name, "Models");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.Extend.cs
index 5f9a806..7372d2b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.Extend.cs
@@ -24,7 +24,7 @@ public void Save()
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Domain", _class.Name);
+                    var dir = Path.Combine(_model.RootPath, "src/Library/Domain", _class.Name);
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs
index a30051b..331888a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs
@@ -16,7 +16,7 @@ public Csproj(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Infrastructure");
+            var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.Extend.cs
index 12ae60e..96e18c3 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.Extend.cs
@@ -17,7 +17,7 @@ public ModuleOptionsConfigure(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Infrastructure/Options");
+            var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure/Options");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.Extend.cs
index 3220d6c..9373574 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.Extend.cs
@@ -17,7 +17,7 @@ public Options(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Infrastructure/Options");
+            var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure/Options");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.Extend.cs
index 35776f7..b0383b3 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.Extend.cs
@@ -17,7 +17,7 @@ public DbContext(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Infrastructure/Repositories");
+            var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure/Repositories");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.Extend.cs
index 03176c9..b2b763d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.Extend.cs
@@ -19,7 +19,7 @@ public MySqlRepository(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Infrastructure/Repositories/MySql");
+            var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure/Repositories/MySql");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.Extend.cs
index 8ace011..1224955 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.Extend.cs
@@ -19,7 +19,7 @@ public SQLiteRepository(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Infrastructure/Repositories/SQLite");
+            var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure/Repositories/SQLite");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.Extend.cs
index 31f3fc5..a150fe0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.Extend.cs
@@ -18,7 +18,7 @@ public SqlServerRepository(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Library/Infrastructure/Repositories/SqlServer");
+            var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure/Repositories/SqlServer");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.Extend.cs
index 9c7d495..0e5c3dc 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.Extend.cs
@@ -14,7 +14,7 @@ public BabelConfig(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.Extend.cs
index 4fa1ae3..a8f2342 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.Extend.cs
@@ -14,7 +14,7 @@ public Browserslistrc(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.Extend.cs
index 0ee55a3..d04d78c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.Extend.cs
@@ -14,7 +14,7 @@ public EditorConfig(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.Extend.cs
index b8b898b..790d38a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.Extend.cs
@@ -14,7 +14,7 @@ public Eslintrc(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.Extend.cs
index fcdb581..4a898e5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.Extend.cs
@@ -16,7 +16,7 @@ public Package(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.Extend.cs
index 536076d..49a26c4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.Extend.cs
@@ -6,17 +6,15 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     public partial class PostcssConfig : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
-        private readonly string _prefix;
 
         public PostcssConfig(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = _model.Project.Prefix;
         }
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.Extend.cs
new file mode 100644
index 0000000..a334569
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.Extend.cs
@@ -0,0 +1,26 @@
+using System.IO;
+using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App
+{
+    public partial class Prettierrc : ITemplateHandler
+    {
+        private readonly TemplateBuildModel _model;
+
+        public Prettierrc(TemplateBuildModel model)
+        {
+            _model = model;
+        }
+
+        public void Save()
+        {
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
+            if (!Directory.Exists(dir))
+                Directory.CreateDirectory(dir);
+
+            var content = TransformText();
+            var filePath = Path.Combine(dir, ".prettierrc");
+            File.WriteAllText(filePath, content);
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.cs
new file mode 100644
index 0000000..d9e57be
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.cs
@@ -0,0 +1,308 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本: 16.0.0.0
+//  
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App
+{
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    
+    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Prettierrc.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public partial class Prettierrc : PrettierrcBase
+    {
+#line hidden
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public virtual string TransformText()
+        {
+            this.Write("{\r\n    \"tabWidth\": 2,\r\n    \"semi\": false,\r\n    \"singleQuote\": true,\r\n    \"printWi" +
+                    "dth\": 200\r\n}");
+            return this.GenerationEnvironment.ToString();
+        }
+    }
+    
+    #line default
+    #line hidden
+    #region Base class
+    /// <summary>
+    /// Base class for this transformation
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public class PrettierrcBase
+    {
+        #region Fields
+        private global::System.Text.StringBuilder generationEnvironmentField;
+        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
+        private global::System.Collections.Generic.List<int> indentLengthsField;
+        private string currentIndentField = "";
+        private bool endsWithNewline;
+        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
+        #endregion
+        #region Properties
+        /// <summary>
+        /// The string builder that generation-time code is using to assemble generated output
+        /// </summary>
+        protected System.Text.StringBuilder GenerationEnvironment
+        {
+            get
+            {
+                if ((this.generationEnvironmentField == null))
+                {
+                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
+                }
+                return this.generationEnvironmentField;
+            }
+            set
+            {
+                this.generationEnvironmentField = value;
+            }
+        }
+        /// <summary>
+        /// The error collection for the generation process
+        /// </summary>
+        public System.CodeDom.Compiler.CompilerErrorCollection Errors
+        {
+            get
+            {
+                if ((this.errorsField == null))
+                {
+                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
+                }
+                return this.errorsField;
+            }
+        }
+        /// <summary>
+        /// A list of the lengths of each indent that was added with PushIndent
+        /// </summary>
+        private System.Collections.Generic.List<int> indentLengths
+        {
+            get
+            {
+                if ((this.indentLengthsField == null))
+                {
+                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
+                }
+                return this.indentLengthsField;
+            }
+        }
+        /// <summary>
+        /// Gets the current indent we use when adding lines to the output
+        /// </summary>
+        public string CurrentIndent
+        {
+            get
+            {
+                return this.currentIndentField;
+            }
+        }
+        /// <summary>
+        /// Current transformation session
+        /// </summary>
+        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
+        {
+            get
+            {
+                return this.sessionField;
+            }
+            set
+            {
+                this.sessionField = value;
+            }
+        }
+        #endregion
+        #region Transform-time helpers
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void Write(string textToAppend)
+        {
+            if (string.IsNullOrEmpty(textToAppend))
+            {
+                return;
+            }
+            // If we're starting off, or if the previous text ended with a newline,
+            // we have to append the current indent first.
+            if (((this.GenerationEnvironment.Length == 0) 
+                        || this.endsWithNewline))
+            {
+                this.GenerationEnvironment.Append(this.currentIndentField);
+                this.endsWithNewline = false;
+            }
+            // Check if the current text ends with a newline
+            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
+            {
+                this.endsWithNewline = true;
+            }
+            // This is an optimization. If the current indent is "", then we don't have to do any
+            // of the more complex stuff further down.
+            if ((this.currentIndentField.Length == 0))
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+                return;
+            }
+            // Everywhere there is a newline in the text, add an indent after it
+            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
+            // If the text ends with a newline, then we should strip off the indent added at the very end
+            // because the appropriate indent will be added when the next time Write() is called
+            if (this.endsWithNewline)
+            {
+                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
+            }
+            else
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+            }
+        }
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void WriteLine(string textToAppend)
+        {
+            this.Write(textToAppend);
+            this.GenerationEnvironment.AppendLine();
+            this.endsWithNewline = true;
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void Write(string format, params object[] args)
+        {
+            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void WriteLine(string format, params object[] args)
+        {
+            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Raise an error
+        /// </summary>
+        public void Error(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Raise a warning
+        /// </summary>
+        public void Warning(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            error.IsWarning = true;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Increase the indent
+        /// </summary>
+        public void PushIndent(string indent)
+        {
+            if ((indent == null))
+            {
+                throw new global::System.ArgumentNullException("indent");
+            }
+            this.currentIndentField = (this.currentIndentField + indent);
+            this.indentLengths.Add(indent.Length);
+        }
+        /// <summary>
+        /// Remove the last indent that was added with PushIndent
+        /// </summary>
+        public string PopIndent()
+        {
+            string returnValue = "";
+            if ((this.indentLengths.Count > 0))
+            {
+                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
+                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
+                if ((indentLength > 0))
+                {
+                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
+                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
+                }
+            }
+            return returnValue;
+        }
+        /// <summary>
+        /// Remove any indentation
+        /// </summary>
+        public void ClearIndent()
+        {
+            this.indentLengths.Clear();
+            this.currentIndentField = "";
+        }
+        #endregion
+        #region ToString Helpers
+        /// <summary>
+        /// Utility class to produce culture-oriented representation of an object as a string.
+        /// </summary>
+        public class ToStringInstanceHelper
+        {
+            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
+            /// <summary>
+            /// Gets or sets format provider to be used by ToStringWithCulture method.
+            /// </summary>
+            public System.IFormatProvider FormatProvider
+            {
+                get
+                {
+                    return this.formatProviderField ;
+                }
+                set
+                {
+                    if ((value != null))
+                    {
+                        this.formatProviderField  = value;
+                    }
+                }
+            }
+            /// <summary>
+            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
+            /// </summary>
+            public string ToStringWithCulture(object objectToConvert)
+            {
+                if ((objectToConvert == null))
+                {
+                    throw new global::System.ArgumentNullException("objectToConvert");
+                }
+                System.Type t = objectToConvert.GetType();
+                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
+                            typeof(System.IFormatProvider)});
+                if ((method == null))
+                {
+                    return objectToConvert.ToString();
+                }
+                else
+                {
+                    return ((string)(method.Invoke(objectToConvert, new object[] {
+                                this.formatProviderField })));
+                }
+            }
+        }
+        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
+        /// <summary>
+        /// Helper to produce culture-oriented representation of an object as a string
+        /// </summary>
+        public ToStringInstanceHelper ToStringHelper
+        {
+            get
+            {
+                return this.toStringHelperField;
+            }
+        }
+        #endregion
+    }
+    #endregion
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.tt
new file mode 100644
index 0000000..408f4e9
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.tt
@@ -0,0 +1,7 @@
+<#@ template language="C#" #>
+{
+    "tabWidth": 2,
+    "semi": false,
+    "singleQuote": true,
+    "printWidth": 200
+}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.Extend.cs
index 890f160..541dbe6 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.Extend.cs
@@ -16,7 +16,7 @@ public VueConfig(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.Extend.cs
index b9ee4a8..0ec7f4f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.Extend.cs
@@ -14,7 +14,7 @@ public Index(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/src");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.Extend.cs
index 6577828..1b5b6e6 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.Extend.cs
@@ -16,7 +16,7 @@ public Main(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/src");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.Extend.cs
index b7bf6a5..dc15055 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.Extend.cs
@@ -14,7 +14,7 @@ public Module(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/src");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.Extend.cs
index bc8bab2..5e821da 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.Extend.cs
@@ -14,7 +14,7 @@ public Index(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/src/api");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/api");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs
index 8f7d06e..b695730 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs
@@ -20,7 +20,7 @@ public Entity(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code,
+            var dir = Path.Combine(_model.RootPath,
                 $"src/UI/{_model.Project.WebUIDicName}/src/api/components");
 
             if (!Directory.Exists(dir))
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
index ff3d4ee..14b249e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
@@ -18,7 +18,7 @@ public Components(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/src/components");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/components");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.Extend.cs
index 6f782af..56b3ff0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.Extend.cs
@@ -14,7 +14,7 @@ public Config(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/src/config");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/config");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.Extend.cs
index bc7a1c0..42c7331 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.Extend.cs
@@ -16,7 +16,7 @@ public Routes(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/src/routes");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/routes");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.Extend.cs
index 279dec2..953dd86 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.Extend.cs
@@ -14,7 +14,7 @@ public Store(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/src/store");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/store");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.Extend.cs
index 8ce8287..8107190 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.Extend.cs
@@ -27,7 +27,7 @@ public void Save()
                 {
                     _class = classModel;
                     
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "components/add");
+                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "components/add");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.Extend.cs
index 68afc47..0f71874 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.Extend.cs
@@ -27,7 +27,7 @@ public void Save()
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "components/edit");
+                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "components/edit");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs
index 51f9ebb..0a0bd2d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs
@@ -25,7 +25,7 @@ public void Save()
                 {
                     _class = classModel;
                     _properties = _class.PropertyList.Where(m => m.ShowInList).ToList();
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "index");
+                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "index");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
index 2e27afa..0d55904 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
@@ -25,7 +25,7 @@ public void Save()
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "index");
+                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "index");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs
index a2599a2..912ec14 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs
@@ -23,7 +23,7 @@ public void Save()
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "index");
+                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "index");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.Extend.cs
index 7f1aedf..b8f551c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.Extend.cs
@@ -15,7 +15,7 @@ public settings(TemplateBuildModel model)
         public void Save()
         {
             var content = TransformText();
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, $"src/UI/{_model.Project.WebUIDicName}/.vscode");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/.vscode");
             if (!Directory.Exists(dir))
             {
                 Directory.CreateDirectory(dir);
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.cs
index 296c758..689978a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.cs
@@ -26,32 +26,13 @@ public partial class settings : settingsBase
         public virtual string TransformText()
         {
             this.Write(@"{
+    ""editor.defaultFormatter"": ""esbenp.prettier-vscode"",
     ""editor.formatOnPaste"": true,
     ""editor.formatOnSave"": true,
     ""editor.formatOnType"": true,
-    ""prettier.singleQuote"": true,
-    ""prettier.semi"": false,
     ""eslint.autoFixOnSave"": true,
-    ""vetur.format.defaultFormatter.html"": ""prettyhtml"",
-    ""vetur.format.defaultFormatter.js"": ""vscode-typescript"",
-    ""vetur.format.defaultFormatterOptions"": {
-        ""prettyhtml"": {
-            ""printWidth"": 180,
-            ""singleQuote"": false,
-            ""wrapAttributes"": false,
-            ""sortAttributes"": false
-        }
-    },
-    ""eslint.validate"": [
-        ""javascript"",
-        ""javascriptreact"",
-        {
-            ""language"": ""vue"",
-            ""autoFix"": true
-        }
-    ],
-    ""beautify.config"": {
-        ""brace_style"": ""collapse,preserve-inline""
+    ""editor.codeActionsOnSave"": {
+        ""source.fixAll.tslint"": true
     }
 }");
             return this.GenerationEnvironment.ToString();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.tt
index b7d9fd0..f2a9431 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.tt
@@ -1,30 +1,10 @@
-<#@ template language="C#" #>
 {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnPaste": true,
     "editor.formatOnSave": true,
     "editor.formatOnType": true,
-    "prettier.singleQuote": true,
-    "prettier.semi": false,
     "eslint.autoFixOnSave": true,
-    "vetur.format.defaultFormatter.html": "prettyhtml",
-    "vetur.format.defaultFormatter.js": "vscode-typescript",
-    "vetur.format.defaultFormatterOptions": {
-        "prettyhtml": {
-            "printWidth": 180,
-            "singleQuote": false,
-            "wrapAttributes": false,
-            "sortAttributes": false
-        }
-    },
-    "eslint.validate": [
-        "javascript",
-        "javascriptreact",
-        {
-            "language": "vue",
-            "autoFix": true
-        }
-    ],
-    "beautify.config": {
-        "brace_style": "collapse,preserve-inline"
+    "editor.codeActionsOnSave": {
+        "source.fixAll.tslint": true
     }
 }
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.Extend.cs
index 5aa74c7..dcde55e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.Extend.cs
@@ -18,7 +18,7 @@ public Controller(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Web/Controllers");
+            var dir = Path.Combine(_model.RootPath, "src/Web/Controllers");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs
index 5af2cc7..5c2fb0f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs
@@ -16,7 +16,7 @@ public Csproj(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Web");
+            var dir = Path.Combine(_model.RootPath, "src/Web");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.Extend.cs
index 4f95502..4003679 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.Extend.cs
@@ -16,7 +16,7 @@ public ModuleController(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Web");
+            var dir = Path.Combine(_model.RootPath, "src/Web");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.Extend.cs
index f1c949d..6781bfb 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.Extend.cs
@@ -16,7 +16,7 @@ public ModuleInitializer(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/Web");
+            var dir = Path.Combine(_model.RootPath, "src/Web");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs
index acaf96e..82c7d60 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs
@@ -16,7 +16,7 @@ public Csproj(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.Extend.cs
index e407289..aee8310 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.Extend.cs
@@ -16,7 +16,7 @@ public Program(TemplateBuildModel model)
 
        public void Save()
        {
-           var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost");
+           var dir = Path.Combine(_model.RootPath, "src/WebHost");
            if (!Directory.Exists(dir))
                Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs
index 2c39594..db0b2b1 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs
@@ -16,7 +16,7 @@ public Startup(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs
index e439e38..ab32ed5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs
@@ -16,7 +16,7 @@ public cache(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs
index 538c382..237148b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs
@@ -16,7 +16,7 @@ public cacheDevelopment(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
index 039a57b..37e4f84 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
@@ -16,7 +16,7 @@ public db(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.Extend.cs
index 20ac369..ce7e355 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.Extend.cs
@@ -14,7 +14,7 @@ public dbDevelopment(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.Extend.cs
index 501c8c4..879acbc 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.Extend.cs
@@ -14,7 +14,7 @@ public host(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.Extend.cs
index 0a0324d..62425d9 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.Extend.cs
@@ -14,7 +14,7 @@ public hostDevelopment(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.Extend.cs
index 59fbd18..42800b2 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.Extend.cs
@@ -14,7 +14,7 @@ public jwt(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.Extend.cs
index 1b4dc6a..884277c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.Extend.cs
@@ -14,7 +14,7 @@ public jwtDevelopment(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.Extend.cs
index 9c6a012..4fbc3a2 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.Extend.cs
@@ -14,7 +14,7 @@ public logging(TemplateBuildModel model)
 
        public void Save()
        {
-           var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost/config");
+           var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
            if (!Directory.Exists(dir))
                Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.Extend.cs
index 4bea644..b5c933d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.Extend.cs
@@ -14,7 +14,7 @@ public loggingDevelopment(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.Extend.cs
index 37d8311..188c88b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.Extend.cs
@@ -14,7 +14,7 @@ public module(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.Extend.cs
index dc84d3c..dda279b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.Extend.cs
@@ -14,7 +14,7 @@ public moduleDevelopment(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, _model.Project.Code, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/TemplateBuilderAbstract.cs b/src/Library/Infrastructure/Templates/TemplateBuilderAbstract.cs
index 604aab9..47ee115 100644
--- a/src/Library/Infrastructure/Templates/TemplateBuilderAbstract.cs
+++ b/src/Library/Infrastructure/Templates/TemplateBuilderAbstract.cs
@@ -20,9 +20,8 @@ public virtual void Build(TemplateBuildModel model)
         {
             Check.NotNull(model, nameof(TemplateBuildModel), "模板生成模型不能为空");
 
-            var dir = Path.Combine(model.RootPath, model.Project.Code);
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
+            if (!Directory.Exists(model.RootPath))
+                Directory.CreateDirectory(model.RootPath);
 
             var handlerTypeList = Assembly.GetExecutingAssembly().GetTypes().Where(t =>
                   typeof(ITemplateHandler) != t && typeof(ITemplateHandler).IsAssignableFrom(t)
diff --git a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
index 4dde032..b879ca2 100644
--- a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
+++ b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.2"}
+{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.3"}
diff --git a/src/UI/module-code-generator/.prettierrc b/src/UI/module-code-generator/.prettierrc
new file mode 100644
index 0000000..b09e913
--- /dev/null
+++ b/src/UI/module-code-generator/.prettierrc
@@ -0,0 +1,6 @@
+{
+    "tabWidth": 2,
+    "semi": false,
+    "singleQuote": true,
+    "printWidth": 200
+}
\ No newline at end of file
diff --git a/src/UI/module-code-generator/.vscode/settings.json b/src/UI/module-code-generator/.vscode/settings.json
index ce3d04e..f2a9431 100644
--- a/src/UI/module-code-generator/.vscode/settings.json
+++ b/src/UI/module-code-generator/.vscode/settings.json
@@ -1,29 +1,10 @@
 {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnPaste": true,
     "editor.formatOnSave": true,
     "editor.formatOnType": true,
-    "prettier.singleQuote": true,
-    "prettier.semi": false,
     "eslint.autoFixOnSave": true,
-    "vetur.format.defaultFormatter.html": "prettyhtml",
-    "vetur.format.defaultFormatter.js": "vscode-typescript",
-    "vetur.format.defaultFormatterOptions": {
-        "prettyhtml": {
-            "printWidth": 180,
-            "singleQuote": false,
-            "wrapAttributes": false,
-            "sortAttributes": false
-        }
-    },
-    "eslint.validate": [
-        "javascript",
-        "javascriptreact",
-        {
-            "language": "vue",
-            "autoFix": true
-        }
-    ],
-    "beautify.config": {
-        "brace_style": "collapse,preserve-inline"
+    "editor.codeActionsOnSave": {
+        "source.fixAll.tslint": true
     }
 }
\ No newline at end of file
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index 527a9b6..218faa4 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -1,6 +1,6 @@
 {
     "name": "netmodular-module-code-generator",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "author": "Oldli",
     "license": "ISC",
     "code": "codeGenerator",
@@ -38,4 +38,4 @@
         "terser-webpack-plugin": "^2.2.1",
         "vue-template-compiler": "^2.6.10"
     }
-}
+}
\ No newline at end of file
diff --git a/src/UI/module-code-generator/src/views/enum/index/index.vue b/src/UI/module-code-generator/src/views/enum/index/index.vue
index 385dab8..4891d99 100644
--- a/src/UI/module-code-generator/src/views/enum/index/index.vue
+++ b/src/UI/module-code-generator/src/views/enum/index/index.vue
@@ -16,17 +16,13 @@
         <nm-button v-bind="buttons.add" @click="add" />
       </template>
 
-      <!--配置枚举项-->
-      <template v-slot:col-name="{row}">
-        <nm-button :text="row.name" type="text" @click="manageItem(row)" />
-      </template>
-
       <!--是否显示-->
-      <template v-slot:col-isShow="{row}">{{row.isShow?'是':'否'}}</template>
+      <template v-slot:col-isShow="{ row }">{{ row.isShow ? '是' : '否' }}</template>
 
       <!--操作列-->
-      <template v-slot:col-operation="{row}">
-        <nm-button v-bind="buttons.edi" @click="edit(row)" />
+      <template v-slot:col-operation="{ row }">
+        <nm-button v-bind="buttons.item" @click="manageItem(row)" />
+        <nm-button v-bind="buttons.edit" @click="edit(row)" />
         <nm-button-delete v-bind="buttons.del" :action="removeAction" :id="row.id" @success="refresh" />
       </template>
     </nm-list>
diff --git a/src/UI/module-code-generator/src/views/enum/index/page.js b/src/UI/module-code-generator/src/views/enum/index/page.js
index 265e3e9..5749d6e 100644
--- a/src/UI/module-code-generator/src/views/enum/index/page.js
+++ b/src/UI/module-code-generator/src/views/enum/index/page.js
@@ -28,6 +28,12 @@ const page = new function() {
       icon: 'delete',
       code: `${this.name}_del`,
       permissions: [`${this.name}_delete_delete`]
+    },
+    item: {
+      text: '配置项',
+      type: 'text',
+      icon: 'tag',
+      code: `${this.name}_item`
     }
   }
 }()
diff --git a/src/UI/module-code-generator/src/views/project/components/add/index.vue b/src/UI/module-code-generator/src/views/project/components/add/index.vue
index b6cc872..ff7b805 100644
--- a/src/UI/module-code-generator/src/views/project/components/add/index.vue
+++ b/src/UI/module-code-generator/src/views/project/components/add/index.vue
@@ -7,11 +7,7 @@
         </el-form-item>
         <el-form-item label="编号：" prop="no">
           <el-input v-model.number="form.model.no" />
-          <nm-txt type="warning">
-            当前项目启动端口号为：后端{{ 6220 + form.model.no }}，后端{{
-              5220 + form.model.no
-            }}
-          </nm-txt>
+          <nm-txt type="warning"> 当前项目启动端口号为：后端{{ 6220 + form.model.no }}，后端{{ 5220 + form.model.no }} </nm-txt>
         </el-form-item>
         <el-form-item label="编码：" prop="code">
           <el-input v-model="form.model.code" />
@@ -24,7 +20,7 @@
   </nm-form-dialog>
 </template>
 <script>
-import { mixins } from 'netmodular-ui';
+import { mixins } from 'netmodular-ui'
 
 const api = $api.codeGenerator.project
 
@@ -47,9 +43,7 @@ export default {
         rules: {
           name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
           code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
-          copyright: [
-            { required: true, message: '请输入版权声明', trigger: 'blur' }
-          ]
+          copyright: [{ required: true, message: '请输入版权声明', trigger: 'blur' }]
         }
       },
       on: {
diff --git a/src/UI/module-code-generator/src/views/property/index/index.vue b/src/UI/module-code-generator/src/views/property/index/index.vue
index 9327493..ea8ce24 100644
--- a/src/UI/module-code-generator/src/views/property/index/index.vue
+++ b/src/UI/module-code-generator/src/views/property/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <nm-list-dialog class="nm-module-code-generator-property" :title=" `属性列表(${parent.name})`" icon="list" width="70%" :visible.sync="visible_" @open="onOpen">
+  <nm-list-dialog class="nm-module-code-generator-property" :title="`属性列表(${parent.name})`" icon="list" width="70%" :visible.sync="visible_" @open="onOpen">
     <nm-list ref="list" v-bind="list">
       <template v-slot:querybar>
         <el-form-item label="名称：" prop="name">
@@ -7,34 +7,35 @@
         </el-form-item>
       </template>
 
-      <template v-slot:querybar-buttons="{total}">
+      <template v-slot:querybar-buttons="{ total }">
         <nm-button type="success" text="添加" icon="add" @click="add(total)" />
         <nm-button type="warning" text="排序" icon="sort" @click="openSort" />
       </template>
 
-      <template v-slot:col-name="{row}">
+      <template v-slot:col-name="{ row }">
         <el-tooltip v-if="row.isInherit" effect="dark" content="继承自基类实体" placement="top">
           <nm-icon class="icon-inherit" name="star-fill" />
         </el-tooltip>
         <el-tooltip v-if="row.isPrimaryKey" effect="dark" content="主键" placement="top">
           <nm-icon class="icon-primarykey" name="key" />
         </el-tooltip>
-        <span>{{row.name}}</span>
+        <span>{{ row.name }}</span>
       </template>
 
-      <template v-slot:col-nullable="{row}">
+      <template v-slot:col-nullable="{ row }">
         <el-switch :value="row.nullable" @change="updateNullable(row)" :disabled="row.isInherit" />
       </template>
 
-      <template v-slot:col-showInList="{row}">
+      <template v-slot:col-showInList="{ row }">
         <el-switch :value="row.showInList" @change="updateShowInList(row)" :disabled="row.isInherit" />
       </template>
 
-      <template v-slot:col-operation="{row}">
+      <template v-slot:col-operation="{ row }">
         <nm-button text="编辑" icon="edit" type="text" @click="edit(row)" :disabled="row.isInherit" />
         <nm-button-delete :action="removeAction" :id="row.id" @success="refresh" :disabled="row.isInherit" />
       </template>
     </nm-list>
+
     <add-page :total="total" :parent="parent" :visible.sync="dialog.add" @success="refresh" />
     <edit-page :id="curr.id" :parent="parent" :visible.sync="dialog.edit" @success="refresh" />
     <nm-drag-sort-dialog v-bind="dragSort" :visible.sync="dialog.sort" @success="refresh" />
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 59ea338..20f5c40 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -6,9 +6,9 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.5.0" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.5.0" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.5.0" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.5.1" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.5.1" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.5.1" />
     <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.1" />
     <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.0" />
   </ItemGroup>

From b5953e0828c7e695e82ac6cb2b0439c7029b4fc5 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Wed, 27 Nov 2019 17:08:17 +0800
Subject: [PATCH 10/71] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/MySql/nm_admin.sql                       |  38 +-
 data/SQLite/Nm_Admin.db                       | Bin 647168 -> 647168 bytes
 data/SqlServer/Nm_Admin.sql                   | Bin 235692 -> 235798 bytes
 src/Directory.Build.props                     |   2 +-
 src/Library/Application/Application.csproj    |   2 +-
 src/Library/Domain/Domain.csproj              |   6 +-
 .../Infrastructure/Infrastructure.csproj      | 104 +++++-
 .../Default/T4/script/NpmInstall.Extend.cs    |  30 ++
 .../Templates/Default/T4/script/NpmInstall.cs | 314 ++++++++++++++++
 .../Templates/Default/T4/script/NpmInstall.tt |   3 +
 .../NpmPublish.Extend.cs}                     |  11 +-
 .../Templates/Default/T4/script/NpmPublish.cs | 314 ++++++++++++++++
 .../Templates/Default/T4/script/NpmPublish.tt |   3 +
 .../Default/T4/script/NpmUpdate.Extend.cs     |  27 ++
 .../EditorConfig.cs => script/NpmUpdate.cs}   |  18 +-
 .../Templates/Default/T4/script/NpmUpdate.tt  |   3 +
 .../T4/src/Library/Application/Csproj.cs      |  12 +-
 .../T4/src/Library/Application/Csproj.tt      |   2 +-
 .../Default/T4/src/Library/Domain/Csproj.cs   |  14 +-
 .../Default/T4/src/Library/Domain/Csproj.tt   |   6 +-
 .../T4/src/Library/Infrastructure/Csproj.cs   |   6 +-
 .../T4/src/Library/Infrastructure/Csproj.tt   |   2 +-
 .../Repositories/MySqlRepository.cs           |  14 +-
 .../PostgreSQLRepository.Extend.cs            |  46 +++
 .../Repositories/PostgreSQLRepository.cs      | 350 ++++++++++++++++++
 .../Repositories/PostgreSQLRepository.tt      |  12 +
 .../Default/T4/src/UI/App/BabelConfig.cs      |   5 +-
 .../Default/T4/src/UI/App/BabelConfig.tt      |  10 +-
 .../Default/T4/src/UI/App/Browserslistrc.cs   |   4 +-
 .../Default/T4/src/UI/App/Browserslistrc.tt   |   2 +-
 .../Default/T4/src/UI/App/EditorConfig.tt     |   6 -
 .../Default/T4/src/UI/App/Eslintrc.cs         |  15 +-
 .../Default/T4/src/UI/App/Eslintrc.tt         |  14 +-
 .../Default/T4/src/UI/App/Package.cs          |  91 +++--
 .../Default/T4/src/UI/App/Package.tt          |  74 ++--
 .../Default/T4/src/UI/App/PostcssConfig.cs    |   2 +-
 .../Default/T4/src/UI/App/Prettierrc.cs       |   6 +-
 .../Default/T4/src/UI/App/Prettierrc.tt       |  10 +-
 .../Default/T4/src/UI/App/VueConfig.cs        |  78 ++--
 .../Default/T4/src/UI/App/VueConfig.tt        |  63 ++--
 .../src/UI/App/src/api/components/Entity.cs   |   2 +-
 .../T4/src/UI/App/src/routes/Routes.cs        |   8 +-
 .../T4/src/UI/App/src/routes/Routes.tt        |   4 +-
 .../T4/src/UI/App/src/views/components/Add.cs |  47 ++-
 .../T4/src/UI/App/src/views/components/Add.tt |  11 +-
 .../src/UI/App/src/views/components/Edit.cs   |  42 +--
 .../src/UI/App/src/views/components/Edit.tt   |   7 +-
 .../T4/src/UI/App/src/views/index/Index.cs    |  62 ++--
 .../T4/src/UI/App/src/views/index/Index.tt    |  18 +-
 .../T4/src/UI/App/src/views/index/Page.cs     |  20 +-
 .../T4/src/UI/App/src/views/index/Page.tt     |   4 +-
 .../Default/T4/src/UI/App/vscode/settings.cs  |  18 +-
 .../Default/T4/src/UI/App/vscode/settings.tt  |  16 +-
 .../Templates/Default/T4/src/Web/Csproj.cs    |  16 +-
 .../Templates/Default/T4/src/Web/Csproj.tt    |   4 +-
 .../Default/T4/src/WebHost/Csproj.cs          |  35 +-
 .../Default/T4/src/WebHost/Csproj.tt          |  13 +-
 .../_modules/CodeGenerator/_module.json       |   2 +-
 src/UI/module-code-generator/.browserslistrc  |   1 -
 src/UI/module-code-generator/.editorconfig    |   5 -
 src/UI/module-code-generator/.eslintrc.js     |   5 +-
 src/UI/module-code-generator/.prettierrc      |  10 +-
 .../.vscode/settings.json                     |  18 +-
 src/UI/module-code-generator/babel.config.js  |   9 +-
 src/UI/module-code-generator/package.json     |  81 ++--
 .../module-code-generator/src/routes/index.js |   4 +-
 .../src/views/class/components/add/index.vue  |  17 +-
 .../src/views/class/components/edit/index.vue |  12 +-
 .../src/views/class/index/index.vue           |  15 +-
 .../src/views/enum/components/add/index.vue   |   8 +-
 .../src/views/enum/components/edit/index.vue  |   8 +-
 .../src/views/enum/index/page.js              |   4 +-
 .../views/enumItem/components/add/index.vue   |  13 +-
 .../views/enumItem/components/edit/index.vue  |   8 +-
 .../src/views/enumItem/index/index.vue        |   4 +-
 .../modelProperty/components/add/index.vue    |   8 +-
 .../modelProperty/components/edit/index.vue   |   8 +-
 .../modelProperty/components/import/index.vue |  21 +-
 .../modelProperty/components/list/index.vue   |  10 +-
 .../src/views/modelProperty/index/index.vue   |  12 +-
 .../views/project/components/edit/index.vue   |  12 +-
 .../src/views/project/index/index.vue         |  17 +-
 .../src/views/project/index/page.js           |   7 +-
 .../views/property/components/add/index.vue   |   8 +-
 .../views/property/components/edit/index.vue  |   8 +-
 .../property/components/type-select/index.js  |  18 +-
 src/UI/module-code-generator/vue.config.js    |   5 +-
 src/Web/Web.csproj                            |   4 +-
 src/WebHost/WebHost.csproj                    |   8 +-
 89 files changed, 1760 insertions(+), 656 deletions(-)
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.Extend.cs
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.cs
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.tt
 rename src/Library/Infrastructure/Templates/Default/T4/{src/UI/App/EditorConfig.Extend.cs => script/NpmPublish.Extend.cs} (63%)
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.cs
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.tt
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.Extend.cs
 rename src/Library/Infrastructure/Templates/Default/T4/{src/UI/App/EditorConfig.cs => script/NpmUpdate.cs} (94%)
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.tt
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.cs
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.tt
 delete mode 100644 src/UI/module-code-generator/.editorconfig

diff --git a/data/MySql/nm_admin.sql b/data/MySql/nm_admin.sql
index 001231e..d18b64b 100644
--- a/data/MySql/nm_admin.sql
+++ b/data/MySql/nm_admin.sql
@@ -1,17 +1,17 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : localhost
+ Source Server         : nm-codegenerator-mysql
  Source Server Type    : MySQL
- Source Server Version : 80015
- Source Host           : 127.0.0.1:3306
+ Source Server Version : 80018
+ Source Host           : localhost:27222
  Source Schema         : nm_admin
 
  Target Server Type    : MySQL
- Target Server Version : 80015
+ Target Server Version : 80018
  File Encoding         : 65001
 
- Date: 24/10/2019 13:32:49
+ Date: 27/11/2019 16:53:58
 */
 
 SET NAMES utf8mb4;
@@ -90,21 +90,23 @@ INSERT INTO `account_role` VALUES (2, '2E23D1D9-4A72-ACC2-F6FF-39ED21CB6A4A', '3
 DROP TABLE IF EXISTS `auditinfo`;
 CREATE TABLE `auditinfo`  (
   `Id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `AccountId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '账户编号',
-  `Area` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '区域',
-  `Controller` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '控制器',
-  `ControllerDesc` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '控制器说明',
-  `Action` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作',
-  `ActionDesc` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作说明',
-  `Parameters` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '参数',
-  `Result` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '返回数据',
-  `ExecutionTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '方法开始执行时间',
-  `ExecutionDuration` bigint(20) NOT NULL COMMENT '方法执行总用时(ms)',
-  `BrowserInfo` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '浏览器信息',
-  `Platform` smallint(6) NOT NULL COMMENT '平台',
+  `AccountId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `AccountName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `Area` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `Module` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `Controller` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `ControllerDesc` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `Action` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `ActionDesc` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `Parameters` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
+  `Result` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
+  `ExecutionTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
+  `ExecutionDuration` bigint(20) NOT NULL DEFAULT 0,
+  `BrowserInfo` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `Platform` smallint(3) NOT NULL DEFAULT 0,
   `IP` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 39837 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for button
diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index dfc775b255ce68278fd4070835ca31760b330321..501318c1eaf69f3a1c597d98d90510c0ec62b5a1 100644
GIT binary patch
delta 2732
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
AU;qFB

delta 10816
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

diff --git a/data/SqlServer/Nm_Admin.sql b/data/SqlServer/Nm_Admin.sql
index dca6a3fc9aaaae551d53acfcdfbea30aeb2e93ce..fb4e2acf06b8dacf1c1f249f88dddaaf40cd8529 100644
GIT binary patch
delta 718
zcmZ3pk#E{2z6o>04H@(qj2O%r6c`MFq!oh!gBg%Co;=ZAeB!BN>iP_242cXyKt=fs
z1q>xXI+vjs2n!i<fb0~YTnP~CPu|V=muR*1Op=@bFtG?q;;@^+bn<+et((t@>|n>O
zWb=F(cNRR-{}r|~<B>kE63jTcK#FIwfRfN;CtaP%1@;1yt<)g&f>5@}b=GW?ozzr7
z;+yN#WSD^rp3M*B$`~iBXm7$}@O$laRy@-AhI{ci3+V6VlRud7ZT@ANgvWCrWz!AT
zF>-BIv##U7Z5vD-$Mgdq86_rP@D-WtXXLQ?hRY%*0-E-4F^O#s@K{C25e=q5br*bH
v@OT;QrwfrBo9_gh5Ky-HLZlFZ(3w6Vg;}ZjNNoF&SVkab+I}RK`Gpk#_NJTI

delta 717
zcmbQXiEqtDz6o<A4H)zpj2KK96c`K{j2Wze*bGRTFqljh6cL?x>X^0*kQ>9`!jQ;N
z0>nu`T+EOP6bWW1WXJ)MsSHI7WneO9@^;3*q^RF~n@Ls>w+l84isW+OmIgX->tqKR
zfz2_pP0R$8C8YCg-l6!739qu1lM7T=O`aerF}XxdXYv7ciOnC>WSD^rk<A<Q%NQs3
zX>Y=-fB7ce11$JeY;G_T!|&GR(;Ye)`6kE6hHTzp#z(-o=?+U6xi(L*uEQTp%O@Xj
zR@nT`g@FH;PhQ|Iwt1JwDgw4nR`3;@{LV#Wv!9;<D}Mh@zu?Twwb>)Yh>$u1PiCNb
fQUCDA(DLaD3Cv2(dU5S~ag0FBv|TTb`Gpk#(@l`X

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 0a69b4f..89c927d 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
     <Id>CodeGenerator</Id>
     <Name>代码生成器</Name>
     <Authors>Oldli</Authors>
-    <Version>1.5.3</Version>
+    <Version>1.5.4</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 1047f63..620175d 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.1" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.6" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.5.0" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 0c86573..c6b809d 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.5.1" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.1" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.5.6" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.6" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.5.4" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index b2b159b..b270e43 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -7,7 +7,7 @@
   <Import Project="..\..\..\build\module.build.targets" />
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.5.0" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.5.5" />
     <PackageReference Include="System.CodeDom" Version="4.6.0" />
   </ItemGroup>
 
@@ -16,10 +16,26 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="Templates\Default\T4\script\NpmInstall.tt">
+      <Generator>TextTemplatingFilePreprocessor</Generator>
+      <LastGenOutput>NpmInstall.cs</LastGenOutput>
+    </None>
+    <None Update="Templates\Default\T4\script\NpmPublish.tt">
+      <Generator>TextTemplatingFilePreprocessor</Generator>
+      <LastGenOutput>NpmPublish.cs</LastGenOutput>
+    </None>
+    <None Update="Templates\Default\T4\script\NpmUpdate.tt">
+      <Generator>TextTemplatingFilePreprocessor</Generator>
+      <LastGenOutput>NpmUpdate.cs</LastGenOutput>
+    </None>
     <None Update="Templates\Default\T4\src\Library\Infrastructure\Options\ModuleOptionsConfigure.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>ModuleOptionsConfigure.cs</LastGenOutput>
     </None>
+    <None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt">
+      <LastGenOutput>PostgreSQLRepository.cs</LastGenOutput>
+      <Generator>TextTemplatingFilePreprocessor</Generator>
+    </None>
     <None Update="Templates\Default\T4\src\UI\App\src\api\components\Entity.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>Entity.cs</LastGenOutput>
@@ -92,10 +108,6 @@
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>Browserslistrc.cs</LastGenOutput>
     </None>
-    <None Update="Templates\Default\T4\src\UI\App\EditorConfig.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>EditorConfig.cs</LastGenOutput>
-    </None>
     <None Update="Templates\Default\T4\src\UI\App\Eslintrc.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>Eslintrc.cs</LastGenOutput>
@@ -176,6 +188,10 @@
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>MySqlRepository.cs</LastGenOutput>
     </None>
+    <None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt">
+      <Generator>TextTemplatingFilePreprocessor</Generator>
+      <LastGenOutput>PostgreSQLRepository.cs</LastGenOutput>
+    </None>
     <None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>SQLiteRepository.cs</LastGenOutput>
@@ -307,6 +323,21 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Update="Templates\Default\T4\script\NpmInstall.*">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NpmInstall.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\script\NpmPublish.*">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NpmPublish.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\script\NpmUpdate.*">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>NpmUpdate.tt</DependentUpon>
+    </Compile>
     <Compile Update="Templates\Default\T4\build\WebBuildTargets.*">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -382,6 +413,11 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>MySqlRepository.tt</DependentUpon>
     </Compile>
+    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.*">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>PostgreSQLRepository.tt</DependentUpon>
+    </Compile>
     <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.*">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -674,4 +710,62 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Templates\Default\T4\src\Library\Application\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\Library\Domain\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\Package.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Package.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\src\routes\Routes.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Routes.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\src\views\components\Add.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Add.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\src\views\components\Edit.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Edit.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Index.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Index.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Page.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Page.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\WebHost\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\Web\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.Extend.cs
new file mode 100644
index 0000000..60bad27
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.Extend.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.script
+{
+    public partial class NpmInstall : ITemplateHandler
+    {
+        private readonly TemplateBuildModel _model;
+
+        public NpmInstall(TemplateBuildModel model)
+        {
+            _model = model;
+        }
+
+        public void Save()
+        {
+            var dir = Path.Combine(_model.RootPath, "script");
+            if (!Directory.Exists(dir))
+                Directory.CreateDirectory(dir);
+
+            var content = TransformText();
+
+            var filePath = Path.Combine(dir, "npm_install.ps1");
+            File.WriteAllText(filePath, content);
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.cs
new file mode 100644
index 0000000..85f8a11
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.cs
@@ -0,0 +1,314 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     �˴����ɹ������ɡ�
+//     ����ʱ�汾: 16.0.0.0
+//  
+//     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
+//     �������ɴ��룬��Щ���Ľ��ᶪʧ��
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.script
+{
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmInstall.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public partial class NpmInstall : NpmInstallBase
+    {
+#line hidden
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public virtual string TransformText()
+        {
+            this.Write("cd ../src/UI/module-");
+            
+            #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmInstall.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
+            
+            #line default
+            #line hidden
+            this.Write("\r\nnpm --registry  https://registry.npmjs.org/ install\r\npause");
+            return this.GenerationEnvironment.ToString();
+        }
+    }
+    
+    #line default
+    #line hidden
+    #region Base class
+    /// <summary>
+    /// Base class for this transformation
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public class NpmInstallBase
+    {
+        #region Fields
+        private global::System.Text.StringBuilder generationEnvironmentField;
+        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
+        private global::System.Collections.Generic.List<int> indentLengthsField;
+        private string currentIndentField = "";
+        private bool endsWithNewline;
+        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
+        #endregion
+        #region Properties
+        /// <summary>
+        /// The string builder that generation-time code is using to assemble generated output
+        /// </summary>
+        protected System.Text.StringBuilder GenerationEnvironment
+        {
+            get
+            {
+                if ((this.generationEnvironmentField == null))
+                {
+                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
+                }
+                return this.generationEnvironmentField;
+            }
+            set
+            {
+                this.generationEnvironmentField = value;
+            }
+        }
+        /// <summary>
+        /// The error collection for the generation process
+        /// </summary>
+        public System.CodeDom.Compiler.CompilerErrorCollection Errors
+        {
+            get
+            {
+                if ((this.errorsField == null))
+                {
+                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
+                }
+                return this.errorsField;
+            }
+        }
+        /// <summary>
+        /// A list of the lengths of each indent that was added with PushIndent
+        /// </summary>
+        private System.Collections.Generic.List<int> indentLengths
+        {
+            get
+            {
+                if ((this.indentLengthsField == null))
+                {
+                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
+                }
+                return this.indentLengthsField;
+            }
+        }
+        /// <summary>
+        /// Gets the current indent we use when adding lines to the output
+        /// </summary>
+        public string CurrentIndent
+        {
+            get
+            {
+                return this.currentIndentField;
+            }
+        }
+        /// <summary>
+        /// Current transformation session
+        /// </summary>
+        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
+        {
+            get
+            {
+                return this.sessionField;
+            }
+            set
+            {
+                this.sessionField = value;
+            }
+        }
+        #endregion
+        #region Transform-time helpers
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void Write(string textToAppend)
+        {
+            if (string.IsNullOrEmpty(textToAppend))
+            {
+                return;
+            }
+            // If we're starting off, or if the previous text ended with a newline,
+            // we have to append the current indent first.
+            if (((this.GenerationEnvironment.Length == 0) 
+                        || this.endsWithNewline))
+            {
+                this.GenerationEnvironment.Append(this.currentIndentField);
+                this.endsWithNewline = false;
+            }
+            // Check if the current text ends with a newline
+            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
+            {
+                this.endsWithNewline = true;
+            }
+            // This is an optimization. If the current indent is "", then we don't have to do any
+            // of the more complex stuff further down.
+            if ((this.currentIndentField.Length == 0))
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+                return;
+            }
+            // Everywhere there is a newline in the text, add an indent after it
+            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
+            // If the text ends with a newline, then we should strip off the indent added at the very end
+            // because the appropriate indent will be added when the next time Write() is called
+            if (this.endsWithNewline)
+            {
+                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
+            }
+            else
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+            }
+        }
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void WriteLine(string textToAppend)
+        {
+            this.Write(textToAppend);
+            this.GenerationEnvironment.AppendLine();
+            this.endsWithNewline = true;
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void Write(string format, params object[] args)
+        {
+            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void WriteLine(string format, params object[] args)
+        {
+            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Raise an error
+        /// </summary>
+        public void Error(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Raise a warning
+        /// </summary>
+        public void Warning(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            error.IsWarning = true;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Increase the indent
+        /// </summary>
+        public void PushIndent(string indent)
+        {
+            if ((indent == null))
+            {
+                throw new global::System.ArgumentNullException("indent");
+            }
+            this.currentIndentField = (this.currentIndentField + indent);
+            this.indentLengths.Add(indent.Length);
+        }
+        /// <summary>
+        /// Remove the last indent that was added with PushIndent
+        /// </summary>
+        public string PopIndent()
+        {
+            string returnValue = "";
+            if ((this.indentLengths.Count > 0))
+            {
+                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
+                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
+                if ((indentLength > 0))
+                {
+                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
+                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
+                }
+            }
+            return returnValue;
+        }
+        /// <summary>
+        /// Remove any indentation
+        /// </summary>
+        public void ClearIndent()
+        {
+            this.indentLengths.Clear();
+            this.currentIndentField = "";
+        }
+        #endregion
+        #region ToString Helpers
+        /// <summary>
+        /// Utility class to produce culture-oriented representation of an object as a string.
+        /// </summary>
+        public class ToStringInstanceHelper
+        {
+            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
+            /// <summary>
+            /// Gets or sets format provider to be used by ToStringWithCulture method.
+            /// </summary>
+            public System.IFormatProvider FormatProvider
+            {
+                get
+                {
+                    return this.formatProviderField ;
+                }
+                set
+                {
+                    if ((value != null))
+                    {
+                        this.formatProviderField  = value;
+                    }
+                }
+            }
+            /// <summary>
+            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
+            /// </summary>
+            public string ToStringWithCulture(object objectToConvert)
+            {
+                if ((objectToConvert == null))
+                {
+                    throw new global::System.ArgumentNullException("objectToConvert");
+                }
+                System.Type t = objectToConvert.GetType();
+                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
+                            typeof(System.IFormatProvider)});
+                if ((method == null))
+                {
+                    return objectToConvert.ToString();
+                }
+                else
+                {
+                    return ((string)(method.Invoke(objectToConvert, new object[] {
+                                this.formatProviderField })));
+                }
+            }
+        }
+        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
+        /// <summary>
+        /// Helper to produce culture-oriented representation of an object as a string
+        /// </summary>
+        public ToStringInstanceHelper ToStringHelper
+        {
+            get
+            {
+                return this.toStringHelperField;
+            }
+        }
+        #endregion
+    }
+    #endregion
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.tt b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.tt
new file mode 100644
index 0000000..c18a738
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.tt
@@ -0,0 +1,3 @@
+cd ../src/UI/module-<#= _model.Project.Code.ToLower() #>
+npm --registry  https://registry.npmjs.org/ install
+pause
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.Extend.cs
similarity index 63%
rename from src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.Extend.cs
rename to src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.Extend.cs
index d04d78c..32e2527 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.Extend.cs
@@ -1,25 +1,26 @@
 using System.IO;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.script
 {
-    public partial class EditorConfig : ITemplateHandler
+   public partial class NpmPublish : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
 
-        public EditorConfig(TemplateBuildModel model)
+        public NpmPublish(TemplateBuildModel model)
         {
             _model = model;
         }
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, "script");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
             var content = TransformText();
-            var filePath = Path.Combine(dir, ".editorconfig");
+
+            var filePath = Path.Combine(dir, "npm_publish.ps1");
             File.WriteAllText(filePath, content);
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.cs
new file mode 100644
index 0000000..44d6680
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.cs
@@ -0,0 +1,314 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     �˴����ɹ������ɡ�
+//     ����ʱ�汾: 16.0.0.0
+//  
+//     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
+//     �������ɴ��룬��Щ���Ľ��ᶪʧ��
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.script
+{
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmPublish.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public partial class NpmPublish : NpmPublishBase
+    {
+#line hidden
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public virtual string TransformText()
+        {
+            this.Write("cd ../src/UI/module-");
+            
+            #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmPublish.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
+            
+            #line default
+            #line hidden
+            this.Write("\r\nnpm --registry  https://registry.npmjs.org/ publish\r\npause");
+            return this.GenerationEnvironment.ToString();
+        }
+    }
+    
+    #line default
+    #line hidden
+    #region Base class
+    /// <summary>
+    /// Base class for this transformation
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public class NpmPublishBase
+    {
+        #region Fields
+        private global::System.Text.StringBuilder generationEnvironmentField;
+        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
+        private global::System.Collections.Generic.List<int> indentLengthsField;
+        private string currentIndentField = "";
+        private bool endsWithNewline;
+        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
+        #endregion
+        #region Properties
+        /// <summary>
+        /// The string builder that generation-time code is using to assemble generated output
+        /// </summary>
+        protected System.Text.StringBuilder GenerationEnvironment
+        {
+            get
+            {
+                if ((this.generationEnvironmentField == null))
+                {
+                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
+                }
+                return this.generationEnvironmentField;
+            }
+            set
+            {
+                this.generationEnvironmentField = value;
+            }
+        }
+        /// <summary>
+        /// The error collection for the generation process
+        /// </summary>
+        public System.CodeDom.Compiler.CompilerErrorCollection Errors
+        {
+            get
+            {
+                if ((this.errorsField == null))
+                {
+                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
+                }
+                return this.errorsField;
+            }
+        }
+        /// <summary>
+        /// A list of the lengths of each indent that was added with PushIndent
+        /// </summary>
+        private System.Collections.Generic.List<int> indentLengths
+        {
+            get
+            {
+                if ((this.indentLengthsField == null))
+                {
+                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
+                }
+                return this.indentLengthsField;
+            }
+        }
+        /// <summary>
+        /// Gets the current indent we use when adding lines to the output
+        /// </summary>
+        public string CurrentIndent
+        {
+            get
+            {
+                return this.currentIndentField;
+            }
+        }
+        /// <summary>
+        /// Current transformation session
+        /// </summary>
+        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
+        {
+            get
+            {
+                return this.sessionField;
+            }
+            set
+            {
+                this.sessionField = value;
+            }
+        }
+        #endregion
+        #region Transform-time helpers
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void Write(string textToAppend)
+        {
+            if (string.IsNullOrEmpty(textToAppend))
+            {
+                return;
+            }
+            // If we're starting off, or if the previous text ended with a newline,
+            // we have to append the current indent first.
+            if (((this.GenerationEnvironment.Length == 0) 
+                        || this.endsWithNewline))
+            {
+                this.GenerationEnvironment.Append(this.currentIndentField);
+                this.endsWithNewline = false;
+            }
+            // Check if the current text ends with a newline
+            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
+            {
+                this.endsWithNewline = true;
+            }
+            // This is an optimization. If the current indent is "", then we don't have to do any
+            // of the more complex stuff further down.
+            if ((this.currentIndentField.Length == 0))
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+                return;
+            }
+            // Everywhere there is a newline in the text, add an indent after it
+            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
+            // If the text ends with a newline, then we should strip off the indent added at the very end
+            // because the appropriate indent will be added when the next time Write() is called
+            if (this.endsWithNewline)
+            {
+                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
+            }
+            else
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+            }
+        }
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void WriteLine(string textToAppend)
+        {
+            this.Write(textToAppend);
+            this.GenerationEnvironment.AppendLine();
+            this.endsWithNewline = true;
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void Write(string format, params object[] args)
+        {
+            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void WriteLine(string format, params object[] args)
+        {
+            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Raise an error
+        /// </summary>
+        public void Error(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Raise a warning
+        /// </summary>
+        public void Warning(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            error.IsWarning = true;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Increase the indent
+        /// </summary>
+        public void PushIndent(string indent)
+        {
+            if ((indent == null))
+            {
+                throw new global::System.ArgumentNullException("indent");
+            }
+            this.currentIndentField = (this.currentIndentField + indent);
+            this.indentLengths.Add(indent.Length);
+        }
+        /// <summary>
+        /// Remove the last indent that was added with PushIndent
+        /// </summary>
+        public string PopIndent()
+        {
+            string returnValue = "";
+            if ((this.indentLengths.Count > 0))
+            {
+                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
+                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
+                if ((indentLength > 0))
+                {
+                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
+                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
+                }
+            }
+            return returnValue;
+        }
+        /// <summary>
+        /// Remove any indentation
+        /// </summary>
+        public void ClearIndent()
+        {
+            this.indentLengths.Clear();
+            this.currentIndentField = "";
+        }
+        #endregion
+        #region ToString Helpers
+        /// <summary>
+        /// Utility class to produce culture-oriented representation of an object as a string.
+        /// </summary>
+        public class ToStringInstanceHelper
+        {
+            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
+            /// <summary>
+            /// Gets or sets format provider to be used by ToStringWithCulture method.
+            /// </summary>
+            public System.IFormatProvider FormatProvider
+            {
+                get
+                {
+                    return this.formatProviderField ;
+                }
+                set
+                {
+                    if ((value != null))
+                    {
+                        this.formatProviderField  = value;
+                    }
+                }
+            }
+            /// <summary>
+            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
+            /// </summary>
+            public string ToStringWithCulture(object objectToConvert)
+            {
+                if ((objectToConvert == null))
+                {
+                    throw new global::System.ArgumentNullException("objectToConvert");
+                }
+                System.Type t = objectToConvert.GetType();
+                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
+                            typeof(System.IFormatProvider)});
+                if ((method == null))
+                {
+                    return objectToConvert.ToString();
+                }
+                else
+                {
+                    return ((string)(method.Invoke(objectToConvert, new object[] {
+                                this.formatProviderField })));
+                }
+            }
+        }
+        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
+        /// <summary>
+        /// Helper to produce culture-oriented representation of an object as a string
+        /// </summary>
+        public ToStringInstanceHelper ToStringHelper
+        {
+            get
+            {
+                return this.toStringHelperField;
+            }
+        }
+        #endregion
+    }
+    #endregion
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.tt b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.tt
new file mode 100644
index 0000000..bc3b853
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.tt
@@ -0,0 +1,3 @@
+cd ../src/UI/module-<#= _model.Project.Code.ToLower() #>
+npm --registry  https://registry.npmjs.org/ publish
+pause
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.Extend.cs
new file mode 100644
index 0000000..dbbe31b
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.Extend.cs
@@ -0,0 +1,27 @@
+using System.IO;
+using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.script
+{
+    public partial class NpmUpdate : ITemplateHandler
+    {
+        private readonly TemplateBuildModel _model;
+
+        public NpmUpdate(TemplateBuildModel model)
+        {
+            _model = model;
+        }
+
+        public void Save()
+        {
+            var dir = Path.Combine(_model.RootPath, "script");
+            if (!Directory.Exists(dir))
+                Directory.CreateDirectory(dir);
+
+            var content = TransformText();
+
+            var filePath = Path.Combine(dir, "npm_update.ps1");
+            File.WriteAllText(filePath, content);
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.cs
similarity index 94%
rename from src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.cs
rename to src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.cs
index d466c18..bf66aa2 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.cs
@@ -7,7 +7,7 @@
 //     �������ɴ��룬��Щ���Ľ��ᶪʧ��
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.script
 {
     using System;
     
@@ -15,9 +15,9 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\EditorConfig.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmUpdate.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class EditorConfig : EditorConfigBase
+    public partial class NpmUpdate : NpmUpdateBase
     {
 #line hidden
         /// <summary>
@@ -25,8 +25,14 @@ public partial class EditorConfig : EditorConfigBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("[*.{js,jsx,ts,tsx,vue}]\r\nindent_style = space\r\nindent_size = 2\r\ntrim_trailing_whi" +
-                    "tespace = true\r\ninsert_final_newline = true\r\n");
+            this.Write("cd ../src/UI/module-");
+            
+            #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmUpdate.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
+            
+            #line default
+            #line hidden
+            this.Write("\r\nnpm --registry  https://registry.npmjs.org/ update\r\npause");
             return this.GenerationEnvironment.ToString();
         }
     }
@@ -38,7 +44,7 @@ public virtual string TransformText()
     /// Base class for this transformation
     /// </summary>
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class EditorConfigBase
+    public class NpmUpdateBase
     {
         #region Fields
         private global::System.Text.StringBuilder generationEnvironmentField;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.tt b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.tt
new file mode 100644
index 0000000..5574ba9
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.tt
@@ -0,0 +1,3 @@
+cd ../src/UI/module-<#= _model.Project.Code.ToLower() #>
+npm --registry  https://registry.npmjs.org/ update
+pause
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
index 99eec5a..9559f32 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Csproj : CsprojBase
     {
@@ -26,17 +26,17 @@ public partial class Csproj : CsprojBase
         public virtual string TransformText()
         {
             this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n  <PropertyGroup>\r\n    <TargetFramework>nets" +
-                    "tandard2.0</TargetFramework>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n    <PackageR" +
-                    "eference Include=\"");
+                    "tandard2.0</TargetFramework>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n\t<PackageRefe" +
+                    "rence Include=\"");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Query\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Query\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
             
-            #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
index 3e1db19..14dbf01 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.5.0" />
+	<PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.5.6" />
     <PackageReference Include="<#= _prefix #>.Lib.Mapper.AutoMapper" Version="1.5.0" />
   </ItemGroup>
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
index b977088..607a2dd 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Csproj : CsprojBase
     {
@@ -29,26 +29,26 @@ public virtual string TransformText()
                     "tandard2.0</TargetFramework>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n    <PackageR" +
                     "eference Include=\"");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Core\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Core\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
             
-            #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Query\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Query\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Core\" Version=\"1.5.0\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n\r\n");
+            this.Write(".Lib.Utils.Core\" Version=\"1.5.4\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
index 864811f..32480e8 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Lib.Data.Core" Version="1.5.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.5.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.Core" Version="1.5.6" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.5.6" />
+    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="1.5.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
index d35292a..debb383 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Csproj : CsprojBase
     {
@@ -30,12 +30,12 @@ public virtual string TransformText()
                     "build\\module.build.targets\" />\r\n\r\n  <ItemGroup>\r\n    <PackageReference Include=\"" +
                     "");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Module.Admin.Domain\" Version=\"1.5.0\" />\r\n  </ItemGroup>\r\n \r\n  <ItemGroup>\r\n    <" +
+            this.Write(".Module.Admin.Domain\" Version=\"1.5.5\" />\r\n  </ItemGroup>\r\n \r\n  <ItemGroup>\r\n    <" +
                     "ProjectReference Include=\"..\\Domain\\Domain.csproj\" />\r\n  </ItemGroup>\r\n\r\n</Proje" +
                     "ct>\r\n");
             return this.GenerationEnvironment.ToString();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
index 029da7d..0810299 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
@@ -8,7 +8,7 @@
   <Import Project="..\..\..\build\module.build.targets" />
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Module.Admin.Domain" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Module.Admin.Domain" Version="1.5.5" />
   </ItemGroup>
  
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.cs
index ab8f40e..9e7cd00 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class MySqlRepository : MySqlRepositoryBase
     {
@@ -27,42 +27,42 @@ public virtual string TransformText()
         {
             this.Write("using ");
             
-            #line 2 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Abstractions;\r\n\r\nnamespace ");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
             
             #line default
             #line hidden
             this.Write(".Infrastructure.Repositories.MySql\r\n{\r\n    public class ");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Repository : SqlServer.");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Repository\r\n    {\r\n        public ");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs
new file mode 100644
index 0000000..920f99d
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Infrastructure.Repositories
+{
+    public partial class PostgreSQLRepository : ITemplateHandler
+    {
+        private readonly TemplateBuildModel _model;
+        private readonly string _prefix;
+        private ClassBuildModel _class;
+
+        public PostgreSQLRepository(TemplateBuildModel model)
+        {
+            _model = model;
+            _prefix = model.Project.Prefix;
+        }
+
+
+        public void Save()
+        {
+            var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure/Repositories/PostgreSQL");
+            if (!Directory.Exists(dir))
+                Directory.CreateDirectory(dir);
+
+            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            {
+                foreach (var classModel in _model.Project.ClassList)
+                {
+                    _class = classModel;
+
+                    //清空
+                    GenerationEnvironment.Clear();
+
+                    var content = TransformText();
+
+                    var filePath = Path.Combine(dir, $"{_class.Name}Repository.cs");
+                    File.WriteAllText(filePath, content);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.cs
new file mode 100644
index 0000000..567d8d7
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.cs
@@ -0,0 +1,350 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本: 16.0.0.0
+//  
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Infrastructure.Repositories
+{
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public partial class PostgreSQLRepository : PostgreSQLRepositoryBase
+    {
+#line hidden
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public virtual string TransformText()
+        {
+            this.Write("    using ");
+            
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            
+            #line default
+            #line hidden
+            this.Write(".Lib.Data.Abstractions;\r\n\r\nnamespace ");
+            
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            
+            #line default
+            #line hidden
+            this.Write(".Module.");
+            
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            
+            #line default
+            #line hidden
+            this.Write(".Infrastructure.Repositories.PostgreSQL\r\n{\r\n    public class ");
+            
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
+            
+            #line default
+            #line hidden
+            this.Write("Repository : SqlServer.");
+            
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
+            
+            #line default
+            #line hidden
+            this.Write("Repository\r\n    {\r\n        public ");
+            
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
+            
+            #line default
+            #line hidden
+            this.Write("Repository(IDbContext dbContext) : base(dbContext)\r\n        {\r\n        }\r\n    }\r\n" +
+                    "}");
+            return this.GenerationEnvironment.ToString();
+        }
+    }
+    
+    #line default
+    #line hidden
+    #region Base class
+    /// <summary>
+    /// Base class for this transformation
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public class PostgreSQLRepositoryBase
+    {
+        #region Fields
+        private global::System.Text.StringBuilder generationEnvironmentField;
+        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
+        private global::System.Collections.Generic.List<int> indentLengthsField;
+        private string currentIndentField = "";
+        private bool endsWithNewline;
+        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
+        #endregion
+        #region Properties
+        /// <summary>
+        /// The string builder that generation-time code is using to assemble generated output
+        /// </summary>
+        protected System.Text.StringBuilder GenerationEnvironment
+        {
+            get
+            {
+                if ((this.generationEnvironmentField == null))
+                {
+                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
+                }
+                return this.generationEnvironmentField;
+            }
+            set
+            {
+                this.generationEnvironmentField = value;
+            }
+        }
+        /// <summary>
+        /// The error collection for the generation process
+        /// </summary>
+        public System.CodeDom.Compiler.CompilerErrorCollection Errors
+        {
+            get
+            {
+                if ((this.errorsField == null))
+                {
+                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
+                }
+                return this.errorsField;
+            }
+        }
+        /// <summary>
+        /// A list of the lengths of each indent that was added with PushIndent
+        /// </summary>
+        private System.Collections.Generic.List<int> indentLengths
+        {
+            get
+            {
+                if ((this.indentLengthsField == null))
+                {
+                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
+                }
+                return this.indentLengthsField;
+            }
+        }
+        /// <summary>
+        /// Gets the current indent we use when adding lines to the output
+        /// </summary>
+        public string CurrentIndent
+        {
+            get
+            {
+                return this.currentIndentField;
+            }
+        }
+        /// <summary>
+        /// Current transformation session
+        /// </summary>
+        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
+        {
+            get
+            {
+                return this.sessionField;
+            }
+            set
+            {
+                this.sessionField = value;
+            }
+        }
+        #endregion
+        #region Transform-time helpers
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void Write(string textToAppend)
+        {
+            if (string.IsNullOrEmpty(textToAppend))
+            {
+                return;
+            }
+            // If we're starting off, or if the previous text ended with a newline,
+            // we have to append the current indent first.
+            if (((this.GenerationEnvironment.Length == 0) 
+                        || this.endsWithNewline))
+            {
+                this.GenerationEnvironment.Append(this.currentIndentField);
+                this.endsWithNewline = false;
+            }
+            // Check if the current text ends with a newline
+            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
+            {
+                this.endsWithNewline = true;
+            }
+            // This is an optimization. If the current indent is "", then we don't have to do any
+            // of the more complex stuff further down.
+            if ((this.currentIndentField.Length == 0))
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+                return;
+            }
+            // Everywhere there is a newline in the text, add an indent after it
+            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
+            // If the text ends with a newline, then we should strip off the indent added at the very end
+            // because the appropriate indent will be added when the next time Write() is called
+            if (this.endsWithNewline)
+            {
+                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
+            }
+            else
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+            }
+        }
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void WriteLine(string textToAppend)
+        {
+            this.Write(textToAppend);
+            this.GenerationEnvironment.AppendLine();
+            this.endsWithNewline = true;
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void Write(string format, params object[] args)
+        {
+            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void WriteLine(string format, params object[] args)
+        {
+            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Raise an error
+        /// </summary>
+        public void Error(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Raise a warning
+        /// </summary>
+        public void Warning(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            error.IsWarning = true;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Increase the indent
+        /// </summary>
+        public void PushIndent(string indent)
+        {
+            if ((indent == null))
+            {
+                throw new global::System.ArgumentNullException("indent");
+            }
+            this.currentIndentField = (this.currentIndentField + indent);
+            this.indentLengths.Add(indent.Length);
+        }
+        /// <summary>
+        /// Remove the last indent that was added with PushIndent
+        /// </summary>
+        public string PopIndent()
+        {
+            string returnValue = "";
+            if ((this.indentLengths.Count > 0))
+            {
+                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
+                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
+                if ((indentLength > 0))
+                {
+                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
+                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
+                }
+            }
+            return returnValue;
+        }
+        /// <summary>
+        /// Remove any indentation
+        /// </summary>
+        public void ClearIndent()
+        {
+            this.indentLengths.Clear();
+            this.currentIndentField = "";
+        }
+        #endregion
+        #region ToString Helpers
+        /// <summary>
+        /// Utility class to produce culture-oriented representation of an object as a string.
+        /// </summary>
+        public class ToStringInstanceHelper
+        {
+            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
+            /// <summary>
+            /// Gets or sets format provider to be used by ToStringWithCulture method.
+            /// </summary>
+            public System.IFormatProvider FormatProvider
+            {
+                get
+                {
+                    return this.formatProviderField ;
+                }
+                set
+                {
+                    if ((value != null))
+                    {
+                        this.formatProviderField  = value;
+                    }
+                }
+            }
+            /// <summary>
+            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
+            /// </summary>
+            public string ToStringWithCulture(object objectToConvert)
+            {
+                if ((objectToConvert == null))
+                {
+                    throw new global::System.ArgumentNullException("objectToConvert");
+                }
+                System.Type t = objectToConvert.GetType();
+                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
+                            typeof(System.IFormatProvider)});
+                if ((method == null))
+                {
+                    return objectToConvert.ToString();
+                }
+                else
+                {
+                    return ((string)(method.Invoke(objectToConvert, new object[] {
+                                this.formatProviderField })));
+                }
+            }
+        }
+        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
+        /// <summary>
+        /// Helper to produce culture-oriented representation of an object as a string
+        /// </summary>
+        public ToStringInstanceHelper ToStringHelper
+        {
+            get
+            {
+                return this.toStringHelperField;
+            }
+        }
+        #endregion
+    }
+    #endregion
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.tt
new file mode 100644
index 0000000..875284d
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.tt
@@ -0,0 +1,12 @@
+<#@ template language="C#" #>
+    using <#= _prefix #>.Lib.Data.Abstractions;
+
+namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Infrastructure.Repositories.PostgreSQL
+{
+    public class <#= _class.Name #>Repository : SqlServer.<#= _class.Name #>Repository
+    {
+        public <#= _class.Name #>Repository(IDbContext dbContext) : base(dbContext)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.cs
index a560cf5..2101f23 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\BabelConfig.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\BabelConfig.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class BabelConfig : BabelConfigBase
     {
@@ -25,8 +25,7 @@ public partial class BabelConfig : BabelConfigBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("module.exports = {\r\n  presets: [\r\n    [\r\n      \'@vue/app\',\r\n      {\r\n        useB" +
-                    "uiltIns: \'entry\'\r\n      }\r\n    ]\r\n  ]\r\n}\r\n");
+            this.Write("module.exports = {\r\n  presets: [\'@vue/cli-plugin-babel/preset\']\r\n}\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.tt
index f1d4510..716b023 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.tt
@@ -1,11 +1,3 @@
-<#@ template language="C#" #>
 module.exports = {
-  presets: [
-    [
-      '@vue/app',
-      {
-        useBuiltIns: 'entry'
-      }
-    ]
-  ]
+  presets: ['@vue/cli-plugin-babel/preset']
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.cs
index 56495fb..423a2a0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Browserslistrc.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Browserslistrc.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Browserslistrc : BrowserslistrcBase
     {
@@ -25,7 +25,7 @@ public partial class Browserslistrc : BrowserslistrcBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("> 1%\r\nlast 2 versions\r\nnot ie <= 8\r\n");
+            this.Write("> 1%\r\nlast 2 versions\r\nnot ie <= 11\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.tt
index 3136930..5e63217 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.tt
@@ -1,4 +1,4 @@
 <#@ template language="C#" #>
 > 1%
 last 2 versions
-not ie <= 8
+not ie <= 11
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.tt
deleted file mode 100644
index 53d8afb..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/EditorConfig.tt
+++ /dev/null
@@ -1,6 +0,0 @@
-<#@ template language="C#" #>
-[*.{js,jsx,ts,tsx,vue}]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-insert_final_newline = true
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.cs
index c240df7..7bdef98 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Eslintrc.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Eslintrc.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Eslintrc : EslintrcBase
     {
@@ -26,22 +26,21 @@ public partial class Eslintrc : EslintrcBase
         public virtual string TransformText()
         {
             this.Write(@"module.exports = {
-    root: true,
+  root: true,
   env: {
     node: true
   },
-  extends: ['plugin:vue/essential', '@vue/standard'],
+  extends: ['plugin:vue/essential', '@vue/prettier'],
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'space-before-function-paren': 'off'
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
   },
   parserOptions: {
     parser: 'babel-eslint'
-  }, 
+  },
   globals: {
-      $http: 'readonly',
-      $api: 'readonly'
+    $http: 'readonly',
+    $api: 'readonly'
   }
 }
 ");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.tt
index 135fbd7..2272e84 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.tt
@@ -1,20 +1,18 @@
-<#@ template language="C#" #>
 module.exports = {
-    root: true,
+  root: true,
   env: {
     node: true
   },
-  extends: ['plugin:vue/essential', '@vue/standard'],
+  extends: ['plugin:vue/essential', '@vue/prettier'],
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'space-before-function-paren': 'off'
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
   },
   parserOptions: {
     parser: 'babel-eslint'
-  }, 
+  },
   globals: {
-      $http: 'readonly',
-      $api: 'readonly'
+    $http: 'readonly',
+    $api: 'readonly'
   }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
index 0fa7bed..acc1793 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
@@ -16,7 +16,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Package : PackageBase
     {
@@ -26,79 +26,76 @@ public partial class Package : PackageBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("{\r\n    \"name\": \"");
+            this.Write("{\r\n  \"name\": \"");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write("-module-");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
             
             #line default
             #line hidden
-            this.Write("\",\r\n    \"version\": \"1.0.0\",\r\n    \"code\": \"");
+            this.Write("\",\r\n  \"version\": \"1.0.0\",\r\n  \"code\": \"");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.FirstCharToLower()));
             
             #line default
             #line hidden
-            this.Write("\",\r\n    \"title\": \"");
+            this.Write("\",\r\n  \"title\": \"");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Name));
             
             #line default
             #line hidden
-            this.Write("\",\r\n    \"description\": \"");
+            this.Write("\",\r\n  \"description\": \"");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Name));
             
             #line default
             #line hidden
             this.Write(@""",
-    ""main"": ""src/index.js"",
-    ""scripts"": {
-        ""serve"": ""vue-cli-service serve"",
-        ""build"": ""vue-cli-service build"",
-        ""lint"": ""vue-cli-service lint"",
-        ""dev"": ""cd ../../WebHost && dotnet watch run"",
-        ""cm"": ""rimraf node_modules"",
-        ""cc"": ""rimraf node_modules/.cache""
-    },
-    ""dependencies"": {
-        """);
-            
-            #line 19 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
-            
-            #line default
-            #line hidden
-            this.Write(@"-module-admin"": ""^1.0.1""
-    },
-    ""devDependencies"": {
-        ""@vue/cli-plugin-babel"": ""^3.11.0"",
-        ""@vue/cli-plugin-eslint"": ""^3.11.0"",
-        ""@vue/cli-service"": ""^3.11.0"",
-        ""@vue/eslint-config-standard"": ""^4.0.0"",
-        ""babel-eslint"": ""^10.0.3"",
-        ""eslint"": ""^6.2.2"",
-        ""eslint-config-elemefe"": ""^0.3.0"",
-        ""eslint-plugin-html"": ""^6.0.0"",
-        ""eslint-plugin-json"": ""^1.4.0"",
-        ""eslint-plugin-vue"": ""^5.2.3"",
-        ""fibers"": ""^4.0.1"",
-        ""rimraf"": ""^3.0.0"",
-        ""sass"": ""^1.22.10"",
-        ""sass-loader"": ""^7.3.1"",
-        ""terser-webpack-plugin"": ""^2.2.1"",
-        ""vue-template-compiler"": ""^2.6.10""
-    }
+  ""main"": ""src/index.js"",
+  ""scripts"": {
+    ""serve"": ""vue-cli-service serve"",
+    ""build"": ""vue-cli-service build"",
+    ""lint"": ""vue-cli-service lint"",
+    ""dev"": ""cd ../../WebHost && dotnet watch run"",
+    ""cm"": ""rimraf node_modules"",
+    ""cc"": ""rimraf node_modules/.cache"",
+    ""i"": ""cd ../../../script && npm_install.ps1"",
+    ""up"": ""cd ../../../script && npm_update.ps1"",
+    ""pub"": ""cd ../../../script && npm_publish.ps1""
+  },
+  ""dependencies"": {
+    ""netmodular-module-admin"": ""^1.0.8"",
+    ""netmodular-ui"": ""^1.2.0""
+  },
+  ""devDependencies"": {
+    ""@vue/cli-plugin-babel"": ""^4.0.0"",
+    ""@vue/cli-plugin-eslint"": ""^4.0.0"",
+    ""@vue/cli-plugin-router"": ""^4.0.0"",
+    ""@vue/cli-plugin-vuex"": ""^4.0.0"",
+    ""@vue/cli-service"": ""^4.0.0"",
+    ""@vue/eslint-config-prettier"": ""^5.0.0"",
+    ""babel-eslint"": ""^10.0.3"",
+    ""eslint"": ""^5.16.0"",
+    ""eslint-plugin-prettier"": ""^3.1.1"",
+    ""eslint-plugin-vue"": ""^5.0.0"",
+    ""prettier"": ""^1.18.2"",
+    ""raw-loader"": ""^3.1.0"",
+    ""rimraf"": ""^3.0.0"",
+    ""sass"": ""^1.22.10"",
+    ""sass-loader"": ""^8.0.0"",
+    ""vue-template-compiler"": ""^2.6.10""
+  }
 }
 ");
             return this.GenerationEnvironment.ToString();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
index 9d1633f..c2b0e38 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
@@ -1,39 +1,43 @@
 <#@ template language="C#" #>
 <#@ import namespace="NetModular.Lib.Utils.Core.Extensions" #>
 {
-    "name": "<#= _prefix #>-module-<#= _model.Project.Code.ToLower() #>",
-    "version": "1.0.0",
-    "code": "<#= _model.Project.Code.FirstCharToLower() #>",
-    "title": "<#= _model.Project.Name #>",
-    "description": "<#= _model.Project.Name #>",
-    "main": "src/index.js",
-    "scripts": {
-        "serve": "vue-cli-service serve",
-        "build": "vue-cli-service build",
-        "lint": "vue-cli-service lint",
-        "dev": "cd ../../WebHost && dotnet watch run",
-        "cm": "rimraf node_modules",
-        "cc": "rimraf node_modules/.cache"
-    },
-    "dependencies": {
-        "<#= _prefix #>-module-admin": "^1.0.1"
-    },
-    "devDependencies": {
-        "@vue/cli-plugin-babel": "^3.11.0",
-        "@vue/cli-plugin-eslint": "^3.11.0",
-        "@vue/cli-service": "^3.11.0",
-        "@vue/eslint-config-standard": "^4.0.0",
-        "babel-eslint": "^10.0.3",
-        "eslint": "^6.2.2",
-        "eslint-config-elemefe": "^0.3.0",
-        "eslint-plugin-html": "^6.0.0",
-        "eslint-plugin-json": "^1.4.0",
-        "eslint-plugin-vue": "^5.2.3",
-        "fibers": "^4.0.1",
-        "rimraf": "^3.0.0",
-        "sass": "^1.22.10",
-        "sass-loader": "^7.3.1",
-        "terser-webpack-plugin": "^2.2.1",
-        "vue-template-compiler": "^2.6.10"
-    }
+  "name": "<#= _prefix #>-module-<#= _model.Project.Code.ToLower() #>",
+  "version": "1.0.0",
+  "code": "<#= _model.Project.Code.FirstCharToLower() #>",
+  "title": "<#= _model.Project.Name #>",
+  "description": "<#= _model.Project.Name #>",
+  "main": "src/index.js",
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint",
+    "dev": "cd ../../WebHost && dotnet watch run",
+    "cm": "rimraf node_modules",
+    "cc": "rimraf node_modules/.cache",
+    "i": "cd ../../../script && npm_install.ps1",
+    "up": "cd ../../../script && npm_update.ps1",
+    "pub": "cd ../../../script && npm_publish.ps1"
+  },
+  "dependencies": {
+    "netmodular-module-admin": "^1.0.8",
+    "netmodular-ui": "^1.2.0"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "^4.0.0",
+    "@vue/cli-plugin-eslint": "^4.0.0",
+    "@vue/cli-plugin-router": "^4.0.0",
+    "@vue/cli-plugin-vuex": "^4.0.0",
+    "@vue/cli-service": "^4.0.0",
+    "@vue/eslint-config-prettier": "^5.0.0",
+    "babel-eslint": "^10.0.3",
+    "eslint": "^5.16.0",
+    "eslint-plugin-prettier": "^3.1.1",
+    "eslint-plugin-vue": "^5.0.0",
+    "prettier": "^1.18.2",
+    "raw-loader": "^3.1.0",
+    "rimraf": "^3.0.0",
+    "sass": "^1.22.10",
+    "sass-loader": "^8.0.0",
+    "vue-template-compiler": "^2.6.10"
+  }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.cs
index 8d19796..884c0fd 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\PostcssConfig.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\PostcssConfig.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class PostcssConfig : PostcssConfigBase
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.cs
index d9e57be..bb11bca 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Prettierrc.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Prettierrc.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Prettierrc : PrettierrcBase
     {
@@ -25,8 +25,8 @@ public partial class Prettierrc : PrettierrcBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("{\r\n    \"tabWidth\": 2,\r\n    \"semi\": false,\r\n    \"singleQuote\": true,\r\n    \"printWi" +
-                    "dth\": 200\r\n}");
+            this.Write("{\r\n  \"tabWidth\": 2,\r\n  \"semi\": false,\r\n  \"singleQuote\": true,\r\n  \"printWidth\": 20" +
+                    "0\r\n}\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.tt
index 408f4e9..9e6fef5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.tt
@@ -1,7 +1,7 @@
 <#@ template language="C#" #>
 {
-    "tabWidth": 2,
-    "semi": false,
-    "singleQuote": true,
-    "printWidth": 200
-}
\ No newline at end of file
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true,
+  "printWidth": 200
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
index 851d9d0..34fdc2b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class VueConfig : VueConfigBase
     {
@@ -30,7 +30,7 @@ public virtual string TransformText()
                     "ess.env.NODE_ENV === \'development\' // ��������\r\n\r\n// ���ӻ�������\r\nprocess.env.VUE_APP_COP" +
                     "YRIGHT = \'");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Copyright));
             
             #line default
@@ -39,40 +39,55 @@ public virtual string TransformText()
                     " ������·��\r\nconst outputDir = \'../../WebHost/wwwroot/app\'\r\n\r\nmodule.exports = {\r\n  " +
                     "outputDir: outputDir,\r\n  publicPath: \'/app\',\r\n  devServer: {\r\n    port: ");
             
-            #line 17 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.No + 5220));
             
             #line default
             #line hidden
-            this.Write("\r\n  },\r\n  transpileDependencies: [\'");
+            this.Write("\r\n  },\r\n  configureWebpack() {\r\n    let config = {\r\n      plugins: [\r\n        /**" +
+                    "\r\n         * ����");
             
-            #line 19 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 23 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write("-.*\', \'element-ui\'],\r\n  configureWebpack: {\r\n    plugins: [\r\n      /**\r\n       * " +
-                    "����");
+            this.Write("-ui/publicĿ¼�µ��ļ������Ŀ¼\r\n         */\r\n        new CopyWebpackPlugin([\r\n          {\r" +
+                    "\n            from: path.join(__dirname, \'node_modules/");
             
-            #line 23 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
-            
-            #line default
-            #line hidden
-            this.Write("-ui/publicĿ¼�µ��ļ������Ŀ¼\r\n       */\r\n      new CopyWebpackPlugin([\r\n        {\r\n     " +
-                    "     from: path.join(__dirname, \'node_modules/");
-            
-            #line 27 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 27 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(@"-ui/public'),
-          to: path.join(__dirname, outputDir),
-          ignore: ['index.html']
-        }
-      ])
-    ]
+            to: path.join(__dirname, outputDir),
+            ignore: ['index.html']
+          }
+        ])
+      ]
+    }
+
+    if (!isDev) {
+      //�Զ������ѹ��
+      config.optimization = {
+        minimize: true,
+        minimizer: [
+          new TerserPlugin({
+            cache: true,
+            parallel: true,
+            sourceMap: false,
+            terserOptions: {
+              compress: {
+                drop_console: true,
+                drop_debugger: true
+              }
+            }
+          })
+        ]
+      }
+    }
+    return config
   },
   chainWebpack: config => {
     /**
@@ -86,7 +101,7 @@ public virtual string TransformText()
     /**
      * ����index.htmlģ��·����ʹ��");
             
-            #line 44 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 66 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -94,7 +109,7 @@ public virtual string TransformText()
             this.Write("-ui/public�е�ģ��\r\n     */\r\n    config.plugin(\'html\').tap(args => {\r\n      args[0].t" +
                     "emplate = \'./node_modules/");
             
-            #line 47 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 69 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -112,19 +127,6 @@ public virtual string TransformText()
       )
       // �ǿ�������
       .when(!isDev, config => {
-        config.optimization.minimizer([
-          new TerserPlugin({
-            cache: true,
-            parallel: true,
-            sourceMap: false, // Must be set to true if using source-maps in production
-            terserOptions: {
-              compress: {
-                drop_console: true,
-                drop_debugger: true
-              }
-            }
-          })
-        ])
 
         // ���
         config.optimization.splitChunks({
@@ -138,14 +140,14 @@ public virtual string TransformText()
             skins: {
               name: 'chunk-");
             
-            #line 84 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 93 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write("-ui\',\r\n              priority: 10,\r\n              test: /[\\\\/]node_modules[\\\\/]");
             
-            #line 86 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 95 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
index 047ce81..0b40027 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
@@ -16,20 +16,42 @@ module.exports = {
   devServer: {
     port: <#= _model.Project.No + 5220 #>
   },
-  transpileDependencies: ['<#= _prefix #>-.*', 'element-ui'],
-  configureWebpack: {
-    plugins: [
-      /**
-       * 复制<#= _prefix #>-ui/public目录下的文件到输出目录
-       */
-      new CopyWebpackPlugin([
-        {
-          from: path.join(__dirname, 'node_modules/<#= _prefix #>-ui/public'),
-          to: path.join(__dirname, outputDir),
-          ignore: ['index.html']
-        }
-      ])
-    ]
+  configureWebpack() {
+    let config = {
+      plugins: [
+        /**
+         * 复制<#= _prefix #>-ui/public目录下的文件到输出目录
+         */
+        new CopyWebpackPlugin([
+          {
+            from: path.join(__dirname, 'node_modules/<#= _prefix #>-ui/public'),
+            to: path.join(__dirname, outputDir),
+            ignore: ['index.html']
+          }
+        ])
+      ]
+    }
+
+    if (!isDev) {
+      //自定义代码压缩
+      config.optimization = {
+        minimize: true,
+        minimizer: [
+          new TerserPlugin({
+            cache: true,
+            parallel: true,
+            sourceMap: false,
+            terserOptions: {
+              compress: {
+                drop_console: true,
+                drop_debugger: true
+              }
+            }
+          })
+        ]
+      }
+    }
+    return config
   },
   chainWebpack: config => {
     /**
@@ -57,19 +79,6 @@ module.exports = {
       )
       // 非开发环境
       .when(!isDev, config => {
-        config.optimization.minimizer([
-          new TerserPlugin({
-            cache: true,
-            parallel: true,
-            sourceMap: false, // Must be set to true if using source-maps in production
-            terserOptions: {
-              compress: {
-                drop_console: true,
-                drop_debugger: true
-              }
-            }
-          })
-        ])
 
         // 拆分
         config.optimization.splitChunks({
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.cs
index 57045c8..7d9bfcc 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\api\components\Entity.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\api\components\Entity.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Entity : EntityBase
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.cs
index 660d7a4..8ccc0af 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\routes\Routes.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\routes\Routes.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Routes : RoutesBase
     {
@@ -27,14 +27,14 @@ public virtual string TransformText()
         {
             this.Write("import loadRoutes from \'");
             
-            #line 2 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\routes\Routes.tt"
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\routes\Routes.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write("-ui/packages/utils/load-routes\'\r\nconst requireComponent = require.context(\'../vie" +
-                    "ws\', true, /\\page.js$/)\r\nexport default loadRoutes(\r\n  requireComponent.keys().m" +
-                    "ap(fileName => requireComponent(fileName).route)\r\n)\r\n");
+                    "ws\', true, /\\page.js$/)\r\nexport default loadRoutes(requireComponent.keys().map(f" +
+                    "ileName => requireComponent(fileName).route))\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.tt
index 8c02b6c..b6b61ec 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.tt
@@ -1,6 +1,4 @@
 <#@ template language="C#" #>
 import loadRoutes from '<#= _prefix #>-ui/packages/utils/load-routes'
 const requireComponent = require.context('../views', true, /\page.js$/)
-export default loadRoutes(
-  requireComponent.keys().map(fileName => requireComponent(fileName).route)
-)
+export default loadRoutes(requireComponent.keys().map(fileName => requireComponent(fileName).route))
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.cs
index 176e2d7..3e0e82a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.cs
@@ -16,7 +16,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Add : AddBase
     {
@@ -28,7 +28,7 @@ public virtual string TransformText()
         {
             this.Write("<template>\r\n  <");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
@@ -36,113 +36,112 @@ public virtual string TransformText()
             this.Write("-form-dialog ref=\"form\" v-bind=\"form\" v-on=\"on\" :visible.sync=\"visible_\">\r\n    <e" +
                     "l-row>\r\n      <el-col :span=\"20\" :offset=\"1\">\r\n");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
     foreach(var p in _class.AddModelPropertyList){ 
             
             #line default
             #line hidden
             this.Write("        <el-form-item label=\"");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
             
             #line default
             #line hidden
             this.Write("��\" prop=\"");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
             this.Write("\">\r\n          <el-input v-model=\"form.model.");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
-            this.Write("\" clearable/>\r\n        </el-form-item>\r\n");
+            this.Write("\" clearable />\r\n        </el-form-item>\r\n");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
     } 
             
             #line default
             #line hidden
             this.Write("      </el-col>\r\n    </el-row>\r\n  </");
             
-            #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
             this.Write("-form-dialog>\r\n</template>\r\n<script>\r\nimport { mixins } from \'");
             
-            #line 17 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix.ToLower()));
             
             #line default
             #line hidden
             this.Write("-ui\'\r\n\r\nconst api = $api.");
             
-            #line 19 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.FirstCharToLower()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 19 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name.FirstCharToLower()));
             
             #line default
             #line hidden
-            this.Write("\r\n\r\nexport default {\r\n  mixins: [mixins.dialog],\r\n  data () {\r\n    return {\r\n    " +
-                    "  form: {\r\n        title: \'����");
+            this.Write("\r\n\r\nexport default {\r\n  mixins: [mixins.dialog],\r\n  data() {\r\n    return {\r\n     " +
+                    " form: {\r\n        title: \'����");
             
-            #line 26 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 26 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Remarks));
             
             #line default
             #line hidden
             this.Write("\',\r\n        icon: \'add\',\r\n        action: api.add,\r\n        model: {\r\n");
             
-            #line 30 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 30 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
     for(var i = 0;i < _class.AddModelPropertyList.Count;i++){ var p=_class.AddModelPropertyList[i]; 
             
             #line default
             #line hidden
             this.Write("          /** ");
             
-            #line 31 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 31 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
             
             #line default
             #line hidden
             this.Write(" */\r\n          ");
             
-            #line 32 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 32 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
             this.Write(": \'\'");
             
-            #line 32 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 32 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(i < _class.AddModelPropertyList.Count-1 ? "," : ""));
             
             #line default
             #line hidden
             this.Write("\r\n");
             
-            #line 33 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
+            #line 33 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
     } 
             
             #line default
             #line hidden
             this.Write(@"        },
-        rules: {
-        }
+        rules: {}
       },
       on: {
         success: this.onSuccess,
@@ -151,10 +150,10 @@ public virtual string TransformText()
     }
   },
   methods: {
-    onSuccess () {
+    onSuccess() {
       this.$emit('success')
     },
-    onOpen () {
+    onOpen() {
       this.$nextTick(() => {
         this.$refs.form.reset()
       })
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.tt
index fad43c0..a167418 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.tt
@@ -6,7 +6,7 @@
       <el-col :span="20" :offset="1">
 <#    foreach(var p in _class.AddModelPropertyList){ #>
         <el-form-item label="<#= p.Remarks #>：" prop="<#= p.CamelName #>">
-          <el-input v-model="form.model.<#= p.CamelName #>" clearable/>
+          <el-input v-model="form.model.<#= p.CamelName #>" clearable />
         </el-form-item>
 <#    } #>
       </el-col>
@@ -20,7 +20,7 @@ const api = $api.<#= _model.Project.Code.FirstCharToLower() #>.<#= _class.Name.F
 
 export default {
   mixins: [mixins.dialog],
-  data () {
+  data() {
     return {
       form: {
         title: '添加<#= _class.Remarks #>',
@@ -32,8 +32,7 @@ export default {
           <#= p.CamelName #>: ''<#=i < _class.AddModelPropertyList.Count-1 ? "," : "" #>
 <#    } #>
         },
-        rules: {
-        }
+        rules: {}
       },
       on: {
         success: this.onSuccess,
@@ -42,10 +41,10 @@ export default {
     }
   },
   methods: {
-    onSuccess () {
+    onSuccess() {
       this.$emit('success')
     },
-    onOpen () {
+    onOpen() {
       this.$nextTick(() => {
         this.$refs.form.reset()
       })
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.cs
index bf7501a..fb8460b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.cs
@@ -16,7 +16,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Edit : EditBase
     {
@@ -28,7 +28,7 @@ public virtual string TransformText()
         {
             this.Write("<template>\r\n  <");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
@@ -36,111 +36,111 @@ public virtual string TransformText()
             this.Write("-form-dialog ref=\"form\" v-bind=\"form\" v-on=\"on\" :visible.sync=\"visible_\">\r\n    <e" +
                     "l-row>\r\n      <el-col :span=\"20\" :offset=\"1\">\r\n");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
     foreach(var p in _class.EditModelPropertyList){ 
             
             #line default
             #line hidden
             this.Write("        <el-form-item label=\"");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
             
             #line default
             #line hidden
             this.Write("��\" prop=\"");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
             this.Write("\">\r\n          <el-input v-model=\"form.model.");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
-            this.Write("\" clearable/>\r\n        </el-form-item>\r\n");
+            this.Write("\" clearable />\r\n        </el-form-item>\r\n");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
     } 
             
             #line default
             #line hidden
             this.Write("      </el-col>\r\n    </el-row>\r\n  </");
             
-            #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
             this.Write("-form-dialog>\r\n</template>\r\n<script>\r\nimport { mixins } from \'");
             
-            #line 17 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix.ToLower()));
             
             #line default
             #line hidden
             this.Write("-ui\'\r\n\r\nconst api = $api.");
             
-            #line 19 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.FirstCharToLower()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 19 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name.FirstCharToLower()));
             
             #line default
             #line hidden
-            this.Write("\r\n\r\nexport default {\r\n  mixins: [mixins.formDialogEdit],\r\n  data () {\r\n    return" +
-                    " {\r\n      api,\r\n      form: {\r\n        title: \'�༭");
+            this.Write("\r\n\r\nexport default {\r\n  mixins: [mixins.formDialogEdit],\r\n  data() {\r\n    return " +
+                    "{\r\n      api,\r\n      form: {\r\n        title: \'�༭");
             
-            #line 27 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 27 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Remarks));
             
             #line default
             #line hidden
             this.Write("\',\r\n        action: api.update,\r\n        model: {\r\n");
             
-            #line 30 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 30 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
     for(var i = 0;i < _class.EditModelPropertyList.Count;i++){ var p = _class.EditModelPropertyList[i]; 
             
             #line default
             #line hidden
             this.Write("          /** ");
             
-            #line 31 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 31 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
             
             #line default
             #line hidden
             this.Write(" */\r\n          ");
             
-            #line 32 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 32 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
             this.Write(": \'\'");
             
-            #line 32 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 32 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(i < _class.EditModelPropertyList.Count-1 ? "," : ""));
             
             #line default
             #line hidden
             this.Write("\r\n");
             
-            #line 33 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 33 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
     } 
             
             #line default
             #line hidden
-            this.Write("        },\r\n        rules: {\r\n        }\r\n      }\r\n    }\r\n  }\r\n}\r\n</script>\r\n");
+            this.Write("        },\r\n        rules: {}\r\n      }\r\n    }\r\n  }\r\n}\r\n</script>\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.tt
index dfb0c3e..daddce5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.tt
@@ -6,7 +6,7 @@
       <el-col :span="20" :offset="1">
 <#    foreach(var p in _class.EditModelPropertyList){ #>
         <el-form-item label="<#= p.Remarks #>：" prop="<#= p.CamelName #>">
-          <el-input v-model="form.model.<#= p.CamelName #>" clearable/>
+          <el-input v-model="form.model.<#= p.CamelName #>" clearable />
         </el-form-item>
 <#    } #>
       </el-col>
@@ -20,7 +20,7 @@ const api = $api.<#= _model.Project.Code.FirstCharToLower() #>.<#= _class.Name.F
 
 export default {
   mixins: [mixins.formDialogEdit],
-  data () {
+  data() {
     return {
       api,
       form: {
@@ -32,8 +32,7 @@ export default {
           <#= p.CamelName #>: ''<#=i < _class.EditModelPropertyList.Count-1 ? "," : "" #>
 <#    } #>
         },
-        rules: {
-        }
+        rules: {}
       }
     }
   }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
index 08a5c85..16c41ab 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
@@ -16,7 +16,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Index : IndexBase
     {
@@ -28,14 +28,14 @@ public virtual string TransformText()
         {
             this.Write("<template>\r\n  <");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
             this.Write("-container>\r\n    <");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
@@ -43,35 +43,35 @@ public virtual string TransformText()
             this.Write("-list ref=\"list\" v-bind=\"list\">\r\n      <!--��ѯ����-->\r\n      <template v-slot:queryb" +
                     "ar>\r\n");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
     foreach(var p in _class.QueryModelPropertyList){ 
             
             #line default
             #line hidden
             this.Write("        <el-form-item label=\"");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
             
             #line default
             #line hidden
             this.Write("��\" prop=\"");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
             this.Write("\">\r\n          <el-input v-model=\"list.model.");
             
-            #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
-            this.Write("\" clearable/>\r\n        </el-form-item>\r\n");
+            this.Write("\" clearable />\r\n        </el-form-item>\r\n");
             
-            #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
     } 
             
             #line default
@@ -79,7 +79,7 @@ public virtual string TransformText()
             this.Write("      </template>\r\n\r\n      <!--��ť-->\r\n      <template v-slot:querybar-buttons>\r\n " +
                     "       <");
             
-            #line 17 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
@@ -87,39 +87,39 @@ public virtual string TransformText()
             this.Write("-button-has :options=\"buttons.add\" @click=\"add\" />\r\n      </template>\r\n\r\n      <!" +
                     "--�Զ�����-->\r\n      <!-- <template v-slot:col-name=\"{row}\">\r\n        <");
             
-            #line 22 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 22 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
             this.Write("-button :text=\"row.name\" type=\"text\" />\r\n      </template> -->\r\n\r\n      <!--������--" +
-                    ">\r\n      <template v-slot:col-operation=\"{row}\">\r\n        <");
+                    ">\r\n      <template v-slot:col-operation=\"{ row }\">\r\n        <");
             
-            #line 27 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 27 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
             this.Write("-button v-bind=\"buttons.edit\" @click=\"edit(row)\" />\r\n        <");
             
-            #line 28 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 28 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
             this.Write("-button-delete v-bind=\"buttons.del\" :id=\"row.id\" :action=\"removeAction\" @success=" +
-                    "\"refresh\"/>\r\n      </template>\r\n    </");
+                    "\"refresh\" />\r\n      </template>\r\n    </");
             
-            #line 30 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 30 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
             this.Write("-list>\r\n\r\n    <!--����-->\r\n    <add-page :visible.sync=\"dialog.add\" @success=\"refre" +
-                    "sh\"/>\r\n    <!--�༭-->\r\n    <edit-page :id=\"curr.id\" :visible.sync=\"dialog.edit\" @" +
-                    "success=\"refresh\"/>\r\n  </");
+                    "sh\" />\r\n    <!--�༭-->\r\n    <edit-page :id=\"curr.id\" :visible.sync=\"dialog.edit\" " +
+                    "@success=\"refresh\" />\r\n  </");
             
-            #line 36 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 36 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
@@ -128,51 +128,51 @@ public virtual string TransformText()
                     "./cols\'\r\nimport AddPage from \'../components/add\'\r\nimport EditPage from \'../compo" +
                     "nents/edit\'\r\n\r\nconst api = $api.");
             
-            #line 44 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 44 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.FirstCharToLower()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 44 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 44 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name.FirstCharToLower()));
             
             #line default
             #line hidden
             this.Write("\r\n\r\nexport default {\r\n  name: page.name,\r\n  components: { AddPage, EditPage },\r\n " +
-                    " data () {\r\n    return {\r\n      curr: { id: \'\' },\r\n      list: {\r\n        title:" +
-                    " page.title,\r\n        cols,\r\n        action: api.query,\r\n        model: {\r\n");
+                    " data() {\r\n    return {\r\n      curr: { id: \'\' },\r\n      list: {\r\n        title: " +
+                    "page.title,\r\n        cols,\r\n        action: api.query,\r\n        model: {\r\n");
             
-            #line 57 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 57 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
     for(var i=0;i<_class.QueryModelPropertyList.Count;i++){ var p=_class.QueryModelPropertyList[i]; 
             
             #line default
             #line hidden
             this.Write("          /** ");
             
-            #line 58 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 58 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
             
             #line default
             #line hidden
             this.Write(" */\r\n          ");
             
-            #line 59 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 59 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
             this.Write(": \'\'");
             
-            #line 59 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 59 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(i < _class.QueryModelPropertyList.Count-1 ? "," : ""));
             
             #line default
             #line hidden
             this.Write("\r\n");
             
-            #line 60 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 60 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
     } 
             
             #line default
@@ -188,13 +188,13 @@ public virtual string TransformText()
     }
   },
   methods: {
-    refresh () {
+    refresh() {
       this.$refs.list.refresh()
     },
-    add () {
+    add() {
       this.dialog.add = true
     },
-    edit (row) {
+    edit(row) {
       this.curr = row
       this.dialog.edit = true
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
index dc00a33..48b91f6 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
@@ -7,7 +7,7 @@
       <template v-slot:querybar>
 <#    foreach(var p in _class.QueryModelPropertyList){ #>
         <el-form-item label="<#= p.Remarks #>：" prop="<#= p.CamelName #>">
-          <el-input v-model="list.model.<#= p.CamelName #>" clearable/>
+          <el-input v-model="list.model.<#= p.CamelName #>" clearable />
         </el-form-item>
 <#    } #>
       </template>
@@ -23,16 +23,16 @@
       </template> -->
 
       <!--操作列-->
-      <template v-slot:col-operation="{row}">
+      <template v-slot:col-operation="{ row }">
         <<#= _uiPrefix #>-button v-bind="buttons.edit" @click="edit(row)" />
-        <<#= _uiPrefix #>-button-delete v-bind="buttons.del" :id="row.id" :action="removeAction" @success="refresh"/>
+        <<#= _uiPrefix #>-button-delete v-bind="buttons.del" :id="row.id" :action="removeAction" @success="refresh" />
       </template>
     </<#= _uiPrefix #>-list>
 
     <!--添加-->
-    <add-page :visible.sync="dialog.add" @success="refresh"/>
+    <add-page :visible.sync="dialog.add" @success="refresh" />
     <!--编辑-->
-    <edit-page :id="curr.id" :visible.sync="dialog.edit" @success="refresh"/>
+    <edit-page :id="curr.id" :visible.sync="dialog.edit" @success="refresh" />
   </<#= _uiPrefix #>-container>
 </template>
 <script>
@@ -46,7 +46,7 @@ const api = $api.<#= _model.Project.Code.FirstCharToLower() #>.<#= _class.Name.F
 export default {
   name: page.name,
   components: { AddPage, EditPage },
-  data () {
+  data() {
     return {
       curr: { id: '' },
       list: {
@@ -69,13 +69,13 @@ export default {
     }
   },
   methods: {
-    refresh () {
+    refresh() {
       this.$refs.list.refresh()
     },
-    add () {
+    add() {
       this.dialog.add = true
     },
-    edit (row) {
+    edit(row) {
       this.curr = row
       this.dialog.edit = true
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.cs
index 1b8b0ec..5f45264 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Page : PageBase
     {
@@ -25,37 +25,37 @@ public partial class Page : PageBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("/** ҳ����Ϣ */\r\nconst page = new function() {\r\n  this.title = \'");
+            this.Write("/** ҳ����Ϣ */\r\nconst page = new (function() {\r\n  this.title = \'");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Remarks));
             
             #line default
             #line hidden
             this.Write("�б�\'\r\n  this.name = \'");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
             
             #line default
             #line hidden
             this.Write("_");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name.ToLower()));
             
             #line default
             #line hidden
             this.Write("\'\r\n  this.path = \'/");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
             
             #line default
             #line hidden
             this.Write("/");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name.ToLower()));
             
             #line default
@@ -89,21 +89,21 @@ public virtual string TransformText()
       permissions: [`${this.name}_delete_delete`]
     }
   }
-}()
+})()
 
 /** ·����Ϣ */
 export const route = {
   page,
   component: () => import(/* webpackChunkName: """);
             
-            #line 40 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+            #line 40 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 40 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+            #line 40 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.tt
index 76f8ba3..73a3058 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.tt
@@ -1,6 +1,6 @@
 <#@ template language="C#" #>
 /** 页面信息 */
-const page = new function() {
+const page = new (function() {
   this.title = '<#= _class.Remarks #>列表'
   this.name = '<#= _model.Project.Code.ToLower() #>_<#= _class.Name.ToLower() #>'
   this.path = '/<#= _model.Project.Code.ToLower() #>/<#= _class.Name.ToLower() #>'
@@ -32,7 +32,7 @@ const page = new function() {
       permissions: [`${this.name}_delete_delete`]
     }
   }
-}()
+})()
 
 /** 路由信息 */
 export const route = {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.cs
index 689978a..5587339 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\vscode\settings.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\vscode\settings.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class settings : settingsBase
     {
@@ -26,14 +26,14 @@ public partial class settings : settingsBase
         public virtual string TransformText()
         {
             this.Write(@"{
-    ""editor.defaultFormatter"": ""esbenp.prettier-vscode"",
-    ""editor.formatOnPaste"": true,
-    ""editor.formatOnSave"": true,
-    ""editor.formatOnType"": true,
-    ""eslint.autoFixOnSave"": true,
-    ""editor.codeActionsOnSave"": {
-        ""source.fixAll.tslint"": true
-    }
+  ""editor.defaultFormatter"": ""esbenp.prettier-vscode"",
+  ""editor.formatOnPaste"": true,
+  ""editor.formatOnSave"": true,
+  ""editor.formatOnType"": true,
+  ""eslint.autoFixOnSave"": true,
+  ""editor.codeActionsOnSave"": {
+    ""source.fixAll.tslint"": true
+  }
 }");
             return this.GenerationEnvironment.ToString();
         }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.tt
index f2a9431..cdf590e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.tt
@@ -1,10 +1,10 @@
 {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnPaste": true,
-    "editor.formatOnSave": true,
-    "editor.formatOnType": true,
-    "eslint.autoFixOnSave": true,
-    "editor.codeActionsOnSave": {
-        "source.fixAll.tslint": true
-    }
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnPaste": true,
+  "editor.formatOnSave": true,
+  "editor.formatOnType": true,
+  "eslint.autoFixOnSave": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.tslint": true
+  }
 }
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
index e3010cb..13ef75e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Csproj : CsprojBase
     {
@@ -33,30 +33,30 @@ public virtual string TransformText()
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include=""");
+	<PackageReference Include=""");
             
-            #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Auth.Web\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Auth.Web\" Version=\"1.5.1\" />\r\n    <PackageReference Include=\"");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Module.AspNetCore\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
-            #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Mvc\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Utils.Mvc\" Version=\"1.5.4\" />\r\n    <PackageReference Include=\"");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
index 3db6fab..82f8c54 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Lib.Auth.Web" Version="1.5.0" />
+	<PackageReference Include="<#= _prefix #>.Lib.Auth.Web" Version="1.5.1" />
     <PackageReference Include="<#= _prefix #>.Lib.Module.AspNetCore" Version="1.5.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Utils.Mvc" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Utils.Mvc" Version="1.5.4" />
     <PackageReference Include="<#= _prefix #>.Lib.Validation.FluentValidation" Version="1.5.0" />
   </ItemGroup>
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
index 60a77d4..a4e04bf 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Csproj : CsprojBase
     {
@@ -26,57 +26,50 @@ public partial class Csproj : CsprojBase
         public virtual string TransformText()
         {
             this.Write("<Project Sdk=\"Microsoft.NET.Sdk.Web\">\r\n\r\n  <PropertyGroup>\r\n    <TargetFramework>" +
-                    "netcoreapp3.0</TargetFramework>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n    <Packa" +
-                    "geReference Include=\"");
+                    "netcoreapp3.0</TargetFramework>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n\t<PackageR" +
+                    "eference Include=\"");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Cache.MemoryCache\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
-            #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Cache.Redis\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.MySql\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.SqlServer\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.SQLite\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
             
-            #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.MySql\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.SqlServer\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.SQLite\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Host.Web\" Version=\"1.5.1\" />\r\n    <PackageReference Include=\"");
             
-            #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Host.Web\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
-            
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
-            
-            #line default
-            #line hidden
-            this.Write(@".Module.Admin.Web"" Version=""1.5.0"" />
+            this.Write(@".Module.Admin.Web"" Version=""1.5.5"" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
index 0e94269..622fc73 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
@@ -6,13 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Lib.Cache.MemoryCache" Version="1.5.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Cache.Redis" Version="1.5.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.SqlServer" Version="1.5.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.MySql" Version="1.5.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.SQLite" Version="1.5.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Host.Web" Version="1.5.0" />
-    <PackageReference Include="<#= _prefix #>.Module.Admin.Web" Version="1.5.0" />
+	<PackageReference Include="<#= _prefix #>.Lib.Cache.MemoryCache" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.MySql" Version="1.5.6" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.SQLite" Version="1.5.6" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.SqlServer" Version="1.5.6" />
+    <PackageReference Include="<#= _prefix #>.Lib.Host.Web" Version="1.5.1" />
+    <PackageReference Include="<#= _prefix #>.Module.Admin.Web" Version="1.5.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
index b879ca2..dfd3207 100644
--- a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
+++ b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.3"}
+{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.4"}
diff --git a/src/UI/module-code-generator/.browserslistrc b/src/UI/module-code-generator/.browserslistrc
index 9dee646..d6471a3 100644
--- a/src/UI/module-code-generator/.browserslistrc
+++ b/src/UI/module-code-generator/.browserslistrc
@@ -1,3 +1,2 @@
 > 1%
 last 2 versions
-not ie <= 8
diff --git a/src/UI/module-code-generator/.editorconfig b/src/UI/module-code-generator/.editorconfig
deleted file mode 100644
index 7053c49..0000000
--- a/src/UI/module-code-generator/.editorconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-[*.{js,jsx,ts,tsx,vue}]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-insert_final_newline = true
diff --git a/src/UI/module-code-generator/.eslintrc.js b/src/UI/module-code-generator/.eslintrc.js
index f3092b0..2272e84 100644
--- a/src/UI/module-code-generator/.eslintrc.js
+++ b/src/UI/module-code-generator/.eslintrc.js
@@ -3,11 +3,10 @@ module.exports = {
   env: {
     node: true
   },
-  extends: ['plugin:vue/essential', '@vue/standard'],
+  extends: ['plugin:vue/essential', '@vue/prettier'],
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'space-before-function-paren': 'off'
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
   },
   parserOptions: {
     parser: 'babel-eslint'
diff --git a/src/UI/module-code-generator/.prettierrc b/src/UI/module-code-generator/.prettierrc
index b09e913..230d376 100644
--- a/src/UI/module-code-generator/.prettierrc
+++ b/src/UI/module-code-generator/.prettierrc
@@ -1,6 +1,6 @@
 {
-    "tabWidth": 2,
-    "semi": false,
-    "singleQuote": true,
-    "printWidth": 200
-}
\ No newline at end of file
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true,
+  "printWidth": 200
+}
diff --git a/src/UI/module-code-generator/.vscode/settings.json b/src/UI/module-code-generator/.vscode/settings.json
index f2a9431..212273d 100644
--- a/src/UI/module-code-generator/.vscode/settings.json
+++ b/src/UI/module-code-generator/.vscode/settings.json
@@ -1,10 +1,10 @@
 {
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnPaste": true,
-    "editor.formatOnSave": true,
-    "editor.formatOnType": true,
-    "eslint.autoFixOnSave": true,
-    "editor.codeActionsOnSave": {
-        "source.fixAll.tslint": true
-    }
-}
\ No newline at end of file
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnPaste": true,
+  "editor.formatOnSave": true,
+  "editor.formatOnType": true,
+  "eslint.autoFixOnSave": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.tslint": true
+  }
+}
diff --git a/src/UI/module-code-generator/babel.config.js b/src/UI/module-code-generator/babel.config.js
index 2ea5d05..716b023 100644
--- a/src/UI/module-code-generator/babel.config.js
+++ b/src/UI/module-code-generator/babel.config.js
@@ -1,10 +1,3 @@
 module.exports = {
-  presets: [
-    [
-      '@vue/app',
-      {
-        useBuiltIns: 'entry'
-      }
-    ]
-  ]
+  presets: ['@vue/cli-plugin-babel/preset']
 }
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index 218faa4..fdb787f 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -1,41 +1,42 @@
 {
-    "name": "netmodular-module-code-generator",
-    "version": "1.0.4",
-    "author": "Oldli",
-    "license": "ISC",
-    "code": "codeGenerator",
-    "title": "代码生成器",
-    "description": "NetModular代码生成器前端模块组件",
-    "main": "src/index.js",
-    "scripts": {
-        "serve": "vue-cli-service serve",
-        "build": "vue-cli-service build",
-        "lint": "vue-cli-service lint",
-        "cm": "rimraf node_modules",
-        "cc": "rimraf node_modules/.cache",
-        "i": "cd ../../../script && npm_install.ps1",
-        "up": "cd ../../../script && npm_update.ps1",
-        "pub": "cd ../../../script && npm_publish.ps1"
-    },
-    "dependencies": {
-        "netmodular-module-admin": "^1.0.2"
-    },
-    "devDependencies": {
-        "@vue/cli-plugin-babel": "^3.10.0",
-        "@vue/cli-plugin-eslint": "^3.10.0",
-        "@vue/cli-service": "^3.10.0",
-        "@vue/eslint-config-standard": "^4.0.0",
-        "babel-eslint": "^10.0.2",
-        "eslint": "^6.1.0",
-        "eslint-config-elemefe": "^0.3.0",
-        "eslint-plugin-html": "^6.0.0",
-        "eslint-plugin-json": "^1.4.0",
-        "eslint-plugin-vue": "^5.2.3",
-        "fibers": "^4.0.1",
-        "rimraf": "^3.0.0",
-        "sass": "^1.23.3",
-        "sass-loader": "^7.2.0",
-        "terser-webpack-plugin": "^2.2.1",
-        "vue-template-compiler": "^2.6.10"
-    }
-}
\ No newline at end of file
+  "name": "netmodular-module-code-generator",
+  "version": "1.0.5",
+  "author": "Oldli",
+  "license": "ISC",
+  "code": "codeGenerator",
+  "title": "代码生成器",
+  "description": "NetModular代码生成器前端模块组件",
+  "main": "src/index.js",
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint",
+    "cm": "rimraf node_modules",
+    "cc": "rimraf node_modules/.cache",
+    "i": "cd ../../../script && npm_install.ps1",
+    "up": "cd ../../../script && npm_update.ps1",
+    "pub": "cd ../../../script && npm_publish.ps1"
+  },
+  "dependencies": {
+    "netmodular-module-admin": "^1.0.8",
+    "netmodular-ui": "^1.2.0"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "^4.0.0",
+    "@vue/cli-plugin-eslint": "^4.0.0",
+    "@vue/cli-plugin-router": "^4.0.0",
+    "@vue/cli-plugin-vuex": "^4.0.0",
+    "@vue/cli-service": "^4.0.0",
+    "@vue/eslint-config-prettier": "^5.0.0",
+    "babel-eslint": "^10.0.3",
+    "eslint": "^5.16.0",
+    "eslint-plugin-prettier": "^3.1.1",
+    "eslint-plugin-vue": "^5.0.0",
+    "prettier": "^1.18.2",
+    "raw-loader": "^3.1.0",
+    "rimraf": "^3.0.0",
+    "sass": "^1.22.10",
+    "sass-loader": "^8.0.0",
+    "vue-template-compiler": "^2.6.10"
+  }
+}
diff --git a/src/UI/module-code-generator/src/routes/index.js b/src/UI/module-code-generator/src/routes/index.js
index c6e8a89..7fc7e1f 100644
--- a/src/UI/module-code-generator/src/routes/index.js
+++ b/src/UI/module-code-generator/src/routes/index.js
@@ -1,5 +1,3 @@
 import loadRoutes from 'netmodular-ui/packages/utils/load-routes'
 const requireComponent = require.context('../views', true, /\page.js$/)
-export default loadRoutes(
-  requireComponent.keys().map(fileName => requireComponent(fileName).route)
-)
+export default loadRoutes(requireComponent.keys().map(fileName => requireComponent(fileName).route))
diff --git a/src/UI/module-code-generator/src/views/class/components/add/index.vue b/src/UI/module-code-generator/src/views/class/components/add/index.vue
index d5e414e..eb427ce 100644
--- a/src/UI/module-code-generator/src/views/class/components/add/index.vue
+++ b/src/UI/module-code-generator/src/views/class/components/add/index.vue
@@ -55,25 +55,16 @@ export default {
           }
         },
         rules: {
-          projectId: [
-            { required: true, message: '请选择项目', trigger: 'blur' }
-          ],
-          name: [
-            { required: true, message: '请输入实体名称', trigger: 'blur' }
-          ],
-          remarks: [
-            { required: true, message: '请输入备注', trigger: 'blur' }
-          ],
-          tableName: [
-            { required: true, message: '请输入表名', trigger: 'blur' }
-          ]
+          projectId: [{ required: true, message: '请选择项目', trigger: 'blur' }],
+          name: [{ required: true, message: '请输入实体名称', trigger: 'blur' }],
+          remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }],
+          tableName: [{ required: true, message: '请输入表名', trigger: 'blur' }]
         }
       },
       on: {
         success: this.onSuccess,
         open: this.onOpen
       }
-
     }
   },
   props: {
diff --git a/src/UI/module-code-generator/src/views/class/components/edit/index.vue b/src/UI/module-code-generator/src/views/class/components/edit/index.vue
index 9721443..59e1e82 100644
--- a/src/UI/module-code-generator/src/views/class/components/edit/index.vue
+++ b/src/UI/module-code-generator/src/views/class/components/edit/index.vue
@@ -51,15 +51,9 @@ export default {
           }
         },
         rules: {
-          name: [
-            { required: true, message: '请输入实体名称', trigger: 'blur' }
-          ],
-          tableName: [
-            { required: true, message: '请输入表名', trigger: 'blur' }
-          ],
-          remarks: [
-            { required: true, message: '请输入备注', trigger: 'blur' }
-          ]
+          name: [{ required: true, message: '请输入实体名称', trigger: 'blur' }],
+          tableName: [{ required: true, message: '请输入表名', trigger: 'blur' }],
+          remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }]
         }
       },
       on: {
diff --git a/src/UI/module-code-generator/src/views/class/index/index.vue b/src/UI/module-code-generator/src/views/class/index/index.vue
index 577592e..a0c0db3 100644
--- a/src/UI/module-code-generator/src/views/class/index/index.vue
+++ b/src/UI/module-code-generator/src/views/class/index/index.vue
@@ -11,7 +11,7 @@
         <nm-button type="success" text="添加" icon="add" @click="add" />
       </template>
 
-      <template v-slot:col-operation="{row}">
+      <template v-slot:col-operation="{ row }">
         <nm-button text="编辑" icon="edit" type="text" @click="edit(row)" />
         <nm-button text="属性" icon="entity" type="text" @click="manageProperty(row)" />
         <nm-button text="视图模型" icon="entity" type="text" @click="openModelManage(row)" />
@@ -101,11 +101,14 @@ export default {
     },
     buildCode(row) {
       let loading = this._loading('正在努力生成代码，请稍后...')
-      api.buildCode(row.id).then(() => {
-        loading.close()
-      }).catch(() => {
-        loading.close()
-      })
+      api
+        .buildCode(row.id)
+        .then(() => {
+          loading.close()
+        })
+        .catch(() => {
+          loading.close()
+        })
     },
     codePreview(row) {
       this.curr = row
diff --git a/src/UI/module-code-generator/src/views/enum/components/add/index.vue b/src/UI/module-code-generator/src/views/enum/components/add/index.vue
index f4219fb..d50bd7d 100644
--- a/src/UI/module-code-generator/src/views/enum/components/add/index.vue
+++ b/src/UI/module-code-generator/src/views/enum/components/add/index.vue
@@ -32,12 +32,8 @@ export default {
           remarks: ''
         },
         rules: {
-          name: [
-            { required: true, message: '请输入名称', trigger: 'blur' }
-          ],
-          remarks: [
-            { required: true, message: '请输入备注', trigger: 'blur' }
-          ]
+          name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+          remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }]
         }
       },
       on: {
diff --git a/src/UI/module-code-generator/src/views/enum/components/edit/index.vue b/src/UI/module-code-generator/src/views/enum/components/edit/index.vue
index abcfc0c..c716b23 100644
--- a/src/UI/module-code-generator/src/views/enum/components/edit/index.vue
+++ b/src/UI/module-code-generator/src/views/enum/components/edit/index.vue
@@ -32,12 +32,8 @@ export default {
           remarks: ''
         },
         rules: {
-          name: [
-            { required: true, message: '请输入名称', trigger: 'blur' }
-          ],
-          remarks: [
-            { required: true, message: '请输入备注', trigger: 'blur' }
-          ]
+          name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+          remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }]
         }
       }
     }
diff --git a/src/UI/module-code-generator/src/views/enum/index/page.js b/src/UI/module-code-generator/src/views/enum/index/page.js
index 5749d6e..d7cec1a 100644
--- a/src/UI/module-code-generator/src/views/enum/index/page.js
+++ b/src/UI/module-code-generator/src/views/enum/index/page.js
@@ -1,5 +1,5 @@
 /** 页面信息 */
-const page = new function() {
+const page = new (function() {
   this.title = '枚举列表'
   this.name = 'codegenerator_enum'
   this.path = '/codegenerator/enum'
@@ -36,7 +36,7 @@ const page = new function() {
       code: `${this.name}_item`
     }
   }
-}()
+})()
 
 /** 路由信息 */
 export const route = {
diff --git a/src/UI/module-code-generator/src/views/enumItem/components/add/index.vue b/src/UI/module-code-generator/src/views/enumItem/components/add/index.vue
index 5bbaa23..43ed1d2 100644
--- a/src/UI/module-code-generator/src/views/enumItem/components/add/index.vue
+++ b/src/UI/module-code-generator/src/views/enumItem/components/add/index.vue
@@ -39,26 +39,19 @@ export default {
           remarks: ''
         },
         rules: {
-          enumId: [
-            { required: true, message: '请选择枚举', trigger: 'blur' }
-          ],
-          name: [
-            { required: true, message: '请输入名称', trigger: 'blur' }
-          ],
+          enumId: [{ required: true, message: '请选择枚举', trigger: 'blur' }],
+          name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
           value: [
             { required: true, message: '请输入值', trigger: 'blur' },
             { type: 'number', message: '请输入值', trigger: 'blur' }
           ],
-          remarks: [
-            { required: true, message: '请输入备注', trigger: 'blur' }
-          ]
+          remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }]
         }
       },
       on: {
         success: this.onSuccess,
         open: this.onOpen
       }
-
     }
   },
   props: {
diff --git a/src/UI/module-code-generator/src/views/enumItem/components/edit/index.vue b/src/UI/module-code-generator/src/views/enumItem/components/edit/index.vue
index 53e2d4b..cd29ab8 100644
--- a/src/UI/module-code-generator/src/views/enumItem/components/edit/index.vue
+++ b/src/UI/module-code-generator/src/views/enumItem/components/edit/index.vue
@@ -38,16 +38,12 @@ export default {
           remarks: ''
         },
         rules: {
-          name: [
-            { required: true, message: '请输入名称', trigger: 'blur' }
-          ],
+          name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
           value: [
             { required: true, message: '请输入值', trigger: 'blur' },
             { type: 'number', message: '请输入正确的数值', trigger: 'blur' }
           ],
-          remarks: [
-            { required: true, message: '请输入备注', trigger: 'blur' }
-          ]
+          remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }]
         }
       },
       on: {
diff --git a/src/UI/module-code-generator/src/views/enumItem/index/index.vue b/src/UI/module-code-generator/src/views/enumItem/index/index.vue
index 230fa8e..fce2a75 100644
--- a/src/UI/module-code-generator/src/views/enumItem/index/index.vue
+++ b/src/UI/module-code-generator/src/views/enumItem/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <nm-list-dialog :title=" `枚举项列表(${parent.name})`" icon="list" height="80%" :visible.sync="visible_" @open="onOpen">
+  <nm-list-dialog :title="`枚举项列表(${parent.name})`" icon="list" height="80%" :visible.sync="visible_" @open="onOpen">
     <nm-list ref="list" v-bind="list">
       <template v-slot:querybar>
         <el-form-item label="名称：" prop="name">
@@ -12,7 +12,7 @@
         <nm-button type="warning" text="排序" icon="sort" @click="openSort" />
       </template>
 
-      <template v-slot:col-operation="{row}">
+      <template v-slot:col-operation="{ row }">
         <nm-button text="编辑" icon="edit" type="text" @click="edit(row)" />
         <nm-button-delete :action="removeAction" :id="row.id" @success="refresh" />
       </template>
diff --git a/src/UI/module-code-generator/src/views/modelProperty/components/add/index.vue b/src/UI/module-code-generator/src/views/modelProperty/components/add/index.vue
index ee2ffb7..14bc1b9 100644
--- a/src/UI/module-code-generator/src/views/modelProperty/components/add/index.vue
+++ b/src/UI/module-code-generator/src/views/modelProperty/components/add/index.vue
@@ -64,12 +64,8 @@ export default {
           sort: 0
         },
         rules: {
-          classId: [
-            { required: true, message: '请选择类', trigger: 'blur' }
-          ],
-          name: [
-            { required: true, message: '请输入类名', trigger: 'blur' }
-          ],
+          classId: [{ required: true, message: '请选择类', trigger: 'blur' }],
+          name: [{ required: true, message: '请输入类名', trigger: 'blur' }],
           type: [
             { required: true, message: '请选择类型', trigger: 'blur' },
             { type: 'number', message: '请选择正确的类型', trigger: 'blur' }
diff --git a/src/UI/module-code-generator/src/views/modelProperty/components/edit/index.vue b/src/UI/module-code-generator/src/views/modelProperty/components/edit/index.vue
index 7c38a1e..785f431 100644
--- a/src/UI/module-code-generator/src/views/modelProperty/components/edit/index.vue
+++ b/src/UI/module-code-generator/src/views/modelProperty/components/edit/index.vue
@@ -64,12 +64,8 @@ export default {
           sort: 0
         },
         rules: {
-          classId: [
-            { required: true, message: '请选择类', trigger: 'blur' }
-          ],
-          name: [
-            { required: true, message: '请输入类名', trigger: 'blur' }
-          ],
+          classId: [{ required: true, message: '请选择类', trigger: 'blur' }],
+          name: [{ required: true, message: '请输入类名', trigger: 'blur' }],
           type: [
             { required: true, message: '请选择类型', trigger: 'blur' },
             { type: 'number', message: '请选择正确的类型', trigger: 'blur' }
diff --git a/src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue b/src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue
index f7161e2..174e728 100644
--- a/src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue
+++ b/src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue
@@ -85,15 +85,18 @@ export default {
 
       const params = { classId: this.parent.id, modelType: this.modelType, ids, sort: this.total }
       this.loading = true
-      api.importFromEntity(params).then(data => {
-        this._success('保存成功')
-        this.$emit('success')
-        this.loading = false
-        this.visible_ = false
-      }).catch(() => {
-        this._error('保存失败')
-        this.loading = false
-      })
+      api
+        .importFromEntity(params)
+        .then(() => {
+          this._success('保存成功')
+          this.$emit('success')
+          this.loading = false
+          this.visible_ = false
+        })
+        .catch(() => {
+          this._error('保存失败')
+          this.loading = false
+        })
     },
     onOpen() {
       this.querySelected()
diff --git a/src/UI/module-code-generator/src/views/modelProperty/components/list/index.vue b/src/UI/module-code-generator/src/views/modelProperty/components/list/index.vue
index d13386a..c6234df 100644
--- a/src/UI/module-code-generator/src/views/modelProperty/components/list/index.vue
+++ b/src/UI/module-code-generator/src/views/modelProperty/components/list/index.vue
@@ -1,26 +1,26 @@
 <template>
   <nm-list ref="list" v-bind="list">
-    <template v-slot:querybar-buttons="{total}">
+    <template v-slot:querybar-buttons="{ total }">
       <nm-button type="success" text="添加" icon="add" @click="add(total)" />
       <nm-button type="warning" text="排序" icon="sort" @click="openSort" />
       <nm-button type="primary" text="从实体导入" icon="import" @click="openImport(total)" />
     </template>
 
-    <template v-slot:col-name="{row}">
+    <template v-slot:col-name="{ row }">
       <el-tooltip v-if="row.isInherit" effect="dark" content="继承自基类实体" placement="top">
         <nm-icon class="icon-inherit" name="star-fill" />
       </el-tooltip>
       <el-tooltip v-if="row.isPrimaryKey" effect="dark" content="主键" placement="top">
         <nm-icon class="icon-primarykey" name="key" />
       </el-tooltip>
-      <span>{{row.name}}</span>
+      <span>{{ row.name }}</span>
     </template>
 
-    <template v-slot:col-nullable="{row}">
+    <template v-slot:col-nullable="{ row }">
       <el-switch :value="row.nullable" @change="updateNullable(row)" />
     </template>
 
-    <template v-slot:col-operation="{row}">
+    <template v-slot:col-operation="{ row }">
       <nm-button text="编辑" icon="edit" type="text" @click="edit(row)" :disabled="row.isInherit" />
       <nm-button-delete :action="removeAction" :id="row.id" @success="refresh" :disabled="row.isInherit" />
     </template>
diff --git a/src/UI/module-code-generator/src/views/modelProperty/index/index.vue b/src/UI/module-code-generator/src/views/modelProperty/index/index.vue
index 715667c..5651136 100644
--- a/src/UI/module-code-generator/src/views/modelProperty/index/index.vue
+++ b/src/UI/module-code-generator/src/views/modelProperty/index/index.vue
@@ -6,19 +6,13 @@
     <div class="top">
       <el-tabs v-model="active" type="card">
         <el-tab-pane name="query">
-          <span slot="label">
-            <nm-icon name="search" />查询模型
-          </span>
+          <span slot="label"> <nm-icon name="search" />查询模型 </span>
         </el-tab-pane>
         <el-tab-pane name="add">
-          <span slot="label">
-            <nm-icon name="add" />添加模型
-          </span>
+          <span slot="label"> <nm-icon name="add" />添加模型 </span>
         </el-tab-pane>
         <el-tab-pane name="update">
-          <span slot="label">
-            <nm-icon name="edit" />编辑模型
-          </span>
+          <span slot="label"> <nm-icon name="edit" />编辑模型 </span>
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/UI/module-code-generator/src/views/project/components/edit/index.vue b/src/UI/module-code-generator/src/views/project/components/edit/index.vue
index a03b657..ed5413b 100644
--- a/src/UI/module-code-generator/src/views/project/components/edit/index.vue
+++ b/src/UI/module-code-generator/src/views/project/components/edit/index.vue
@@ -40,15 +40,9 @@ export default {
           copyright: ''
         },
         rules: {
-          name: [
-            { required: true, message: '请输入名称', trigger: 'blur' }
-          ],
-          code: [
-            { required: true, message: '请输入编码', trigger: 'blur' }
-          ],
-          copyright: [
-            { required: true, message: '请输入版权声明', trigger: 'blur' }
-          ]
+          name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+          code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
+          copyright: [{ required: true, message: '请输入版权声明', trigger: 'blur' }]
         }
       }
     }
diff --git a/src/UI/module-code-generator/src/views/project/index/index.vue b/src/UI/module-code-generator/src/views/project/index/index.vue
index 072f6fd..eb96f0d 100644
--- a/src/UI/module-code-generator/src/views/project/index/index.vue
+++ b/src/UI/module-code-generator/src/views/project/index/index.vue
@@ -17,10 +17,10 @@
       </template>
 
       <!--是否显示-->
-      <template v-slot:col-isShow="{row}">{{row.isShow?'是':'否'}}</template>
+      <template v-slot:col-isShow="{ row }">{{ row.isShow ? '是' : '否' }}</template>
 
       <!--操作列-->
-      <template v-slot:col-operation="{row}">
+      <template v-slot:col-operation="{ row }">
         <nm-button v-bind="buttons.edit" @click="edit(row)" />
         <nm-button text="实体" icon="entity" type="text" @click="manageClass(row)" />
         <nm-button v-bind="buttons.buildCode" @click="buildCode(row)" />
@@ -84,11 +84,14 @@ export default {
     },
     buildCode(row) {
       let loading = this._loading('正在努力生成代码，请稍后...')
-      api.buildCode({ id: row.id }).then(() => {
-        loading.close()
-      }).catch(() => {
-        loading.close()
-      })
+      api
+        .buildCode({ id: row.id })
+        .then(() => {
+          loading.close()
+        })
+        .catch(() => {
+          loading.close()
+        })
     },
     manageClass(row) {
       this.curr = row
diff --git a/src/UI/module-code-generator/src/views/project/index/page.js b/src/UI/module-code-generator/src/views/project/index/page.js
index a435194..3f2d59d 100644
--- a/src/UI/module-code-generator/src/views/project/index/page.js
+++ b/src/UI/module-code-generator/src/views/project/index/page.js
@@ -1,5 +1,5 @@
 /** 页面信息 */
-const page = new function() {
+const page = new (function() {
   this.title = '项目列表'
   this.icon = 'project'
   this.name = 'codegenerator_project'
@@ -39,13 +39,12 @@ const page = new function() {
       permissions: [`${this.name}_buildcode_post`]
     }
   }
-}()
+})()
 
 /** 路由信息 */
 export const route = {
   page,
-  component: () =>
-    import(/* webpackChunkName: "codegenerator.project" */ './index')
+  component: () => import(/* webpackChunkName: "codegenerator.project" */ './index')
 }
 
 export default page
diff --git a/src/UI/module-code-generator/src/views/property/components/add/index.vue b/src/UI/module-code-generator/src/views/property/components/add/index.vue
index 57f5f43..172ffb0 100644
--- a/src/UI/module-code-generator/src/views/property/components/add/index.vue
+++ b/src/UI/module-code-generator/src/views/property/components/add/index.vue
@@ -145,12 +145,8 @@ export default {
           hasDefaultValue: false
         },
         rules: {
-          classId: [
-            { required: true, message: '请选择类', trigger: 'blur' }
-          ],
-          name: [
-            { required: true, message: '请输入类名', trigger: 'blur' }
-          ],
+          classId: [{ required: true, message: '请选择类', trigger: 'blur' }],
+          name: [{ required: true, message: '请输入类名', trigger: 'blur' }],
           type: [
             { required: true, message: '请选择类型', trigger: 'blur' },
             { type: 'number', message: '请选择正确的类型', trigger: 'blur' }
diff --git a/src/UI/module-code-generator/src/views/property/components/edit/index.vue b/src/UI/module-code-generator/src/views/property/components/edit/index.vue
index 784ec9c..13883bc 100644
--- a/src/UI/module-code-generator/src/views/property/components/edit/index.vue
+++ b/src/UI/module-code-generator/src/views/property/components/edit/index.vue
@@ -144,12 +144,8 @@ export default {
           hasDefaultValue: false
         },
         rules: {
-          classId: [
-            { required: true, message: '请选择类', trigger: 'blur' }
-          ],
-          name: [
-            { required: true, message: '请输入类名', trigger: 'blur' }
-          ],
+          classId: [{ required: true, message: '请选择类', trigger: 'blur' }],
+          name: [{ required: true, message: '请输入类名', trigger: 'blur' }],
           type: [
             { required: true, message: '请选择类型', trigger: 'blur' },
             { type: 'number', message: '请选择正确的类型', trigger: 'blur' }
diff --git a/src/UI/module-code-generator/src/views/property/components/type-select/index.js b/src/UI/module-code-generator/src/views/property/components/type-select/index.js
index 308b8a6..96db02c 100644
--- a/src/UI/module-code-generator/src/views/property/components/type-select/index.js
+++ b/src/UI/module-code-generator/src/views/property/components/type-select/index.js
@@ -1,26 +1,14 @@
 import { mixins } from 'netmodular-ui'
-const typeArr = [
-  'String',
-  'Byte',
-  'Short',
-  'Int',
-  'Long',
-  'Double',
-  'Decimal',
-  'Bool',
-  'Guid',
-  'DateTime',
-  'Enum'
-]
+const typeArr = ['String', 'Byte', 'Short', 'Int', 'Long', 'Double', 'Decimal', 'Bool', 'Guid', 'DateTime', 'Enum']
 let i = 0
 const options = typeArr.map(item => {
   return { label: item, value: i++ }
 })
 export default {
   mixins: [mixins.select],
-  data () {
+  data() {
     return {
-      action () {
+      action() {
         return new Promise(resolve => {
           resolve(options)
         })
diff --git a/src/UI/module-code-generator/vue.config.js b/src/UI/module-code-generator/vue.config.js
index 4f475f4..bf0ed99 100644
--- a/src/UI/module-code-generator/vue.config.js
+++ b/src/UI/module-code-generator/vue.config.js
@@ -13,9 +13,8 @@ module.exports = {
   outputDir: outputDir,
   publicPath: '/app',
   devServer: {
-    port: 5222
+    port: 5221
   },
-  transpileDependencies: ['nm-.*', 'element-ui'],
   configureWebpack: {
     plugins: [
       /**
@@ -80,7 +79,7 @@ module.exports = {
               test: /[\\/]node_modules[\\/]element-ui(.*)/
             },
             skins: {
-              name: 'chunk-skins',
+              name: 'chunk-netmodular-ui',
               priority: 10,
               test: /[\\/]node_modules[\\/]netmodular-ui(.*)/
             }
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index a76df23..a7f5804 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.1" />
     <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.5.0" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.5.4" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.5.0" />
   </ItemGroup>
   
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 20f5c40..c1feb80 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -6,11 +6,11 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.5.0" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.5.1" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.5.1" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.5.1" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.5.6" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.5.6" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.5.6" />
     <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.1" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.0" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.5" />
   </ItemGroup>
 
   <ItemGroup>

From 3babca859c848cba778651e2337166211bdec18c Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Thu, 5 Dec 2019 16:50:05 +0800
Subject: [PATCH 11/71] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/MySql/nm_admin.sql                       | 218 ++++++++++--------
 data/SQLite/Nm_Admin.db                       | Bin 647168 -> 647168 bytes
 data/SqlServer/Nm_Admin.sql                   | Bin 235798 -> 252188 bytes
 .../Infrastructure/Infrastructure.csproj      |   4 +-
 src/UI/module-code-generator/package.json     |  14 +-
 src/UI/module-code-generator/vue.config.js    |  65 +++---
 src/Web/Web.csproj                            |   2 +-
 src/WebHost/WebHost.csproj                    |   2 +-
 8 files changed, 166 insertions(+), 139 deletions(-)

diff --git a/data/MySql/nm_admin.sql b/data/MySql/nm_admin.sql
index d18b64b..dad2bb2 100644
--- a/data/MySql/nm_admin.sql
+++ b/data/MySql/nm_admin.sql
@@ -11,7 +11,7 @@
  Target Server Version : 80018
  File Encoding         : 65001
 
- Date: 27/11/2019 16:53:58
+ Date: 05/12/2019 16:44:17
 */
 
 SET NAMES utf8mb4;
@@ -48,7 +48,7 @@ CREATE TABLE `account`  (
 -- ----------------------------
 -- Records of account
 -- ----------------------------
-INSERT INTO `account` VALUES ('2E23D1D9-4A72-ACC2-F6FF-39ED21CB6A4A', 0, 'admin', 'E739279CB28CDAFD7373618313803524', '管理员', '', '', '2019-10-24 13:30:23', '0.0.0.1', 1, b'0', '2019-10-09 00:00:00', '00000000-0000-0000-0000-000000000000', '2019-10-09 00:00:00', '00000000-0000-0000-0000-000000000000', '2019-10-09 00:00:00', '00000000-0000-0000-0000-000000000000', b'0', '2019-10-09 00:00:00', '00000000-0000-0000-0000-000000000000');
+INSERT INTO `account` VALUES ('2E23D1D9-4A72-ACC2-F6FF-39ED21CB6A4A', 0, 'admin', 'E739279CB28CDAFD7373618313803524', '管理员', '', '', '2019-12-05 16:43:04', '0.0.0.1', 1, b'0', '2019-10-09 00:00:00', '00000000-0000-0000-0000-000000000000', '2019-10-09 00:00:00', '00000000-0000-0000-0000-000000000000', '2019-10-09 00:00:00', '00000000-0000-0000-0000-000000000000', b'0', '2019-10-09 00:00:00', '00000000-0000-0000-0000-000000000000');
 
 -- ----------------------------
 -- Table structure for account_config
@@ -106,7 +106,7 @@ CREATE TABLE `auditinfo`  (
   `Platform` smallint(3) NOT NULL DEFAULT 0,
   `IP` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for button
@@ -297,24 +297,33 @@ CREATE TABLE `config`  (
   `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
   `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 23 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of config
 -- ----------------------------
-INSERT INTO `config` VALUES (1, 'sys_title', '通用权限管理系统', '系统标题', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `config` VALUES (2, 'sys_logo', '', '系统Logo', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `config` VALUES (3, 'sys_home', '/admin/home', '系统首页', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `config` VALUES (4, 'sys_userinfo_page', '', '个人信息页', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
+INSERT INTO `config` VALUES (1, 'sys_title', '通用权限管理系统', '系统标题', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:29', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (2, 'sys_logo', '', '系统Logo', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:29', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (3, 'sys_home', '/admin/home', '系统首页地址', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:29', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (4, 'sys_userinfo_page', '', '个人信息页', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:29', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
 INSERT INTO `config` VALUES (5, 'sys_button_permission', 'True', '启用按钮权限', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `config` VALUES (6, 'sys_permission_validate', 'True', '启用权限验证功能', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
+INSERT INTO `config` VALUES (6, 'sys_permission_validate', 'True', '开启权限验证', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
 INSERT INTO `config` VALUES (7, 'sys_auditing', 'True', '启用审计日志', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
 INSERT INTO `config` VALUES (8, 'sys_verify_code', 'False', '启用登录验证码功能', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `config` VALUES (9, 'sys_toolbar_fullscreen', 'True', '显示工具栏全屏按钮', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `config` VALUES (10, 'sys_toolbar_skin', 'True', '显示工具栏皮肤按钮', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `config` VALUES (11, 'sys_toolbar_logout', 'True', '显示工具栏退出按钮', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `config` VALUES (12, 'sys_toolbar_userinfo', 'True', '显示工具栏用户信息按钮', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
+INSERT INTO `config` VALUES (9, 'sys_toolbar_fullscreen', 'True', '全屏按钮', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:39', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (10, 'sys_toolbar_skin', 'True', '皮肤设置按钮', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:39', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (11, 'sys_toolbar_logout', 'True', '退出按钮', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:39', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (12, 'sys_toolbar_userinfo', 'True', '用户信息按钮', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:39', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
 INSERT INTO `config` VALUES (13, 'sys_toolbar_customcss', '', '自定义CSS样式', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
+INSERT INTO `config` VALUES (14, 'sys_copyright', '版权所有：尼古拉斯·老李 | 用代码改变世界 Powered byET Core 3.0.0 on Linux', '版权声明', '2019-12-05 16:43:29', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:29', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (15, 'sys_permission_button', 'True', '启用按钮权限', '2019-12-05 16:43:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (16, 'sys_permission_auditing', 'True', '审计日志', '2019-12-05 16:43:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (17, 'sys_login_type', 'neon', '登录页类型', '2019-12-05 16:43:37', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:37', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (18, 'sys_login_verify_code', 'False', '启用验证码功能', '2019-12-05 16:43:37', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:37', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (19, 'sys_component_menu_unique_opened', 'True', '菜单只能打开一个', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (20, 'sys_component_dialog_close_on_click_modal', 'False', '是否可以点击模态框关闭', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (21, 'sys_component_list_serial_number_name', '', '序号名称', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `config` VALUES (22, 'sys_component_custom_css', '', '自定义Css样式', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
 
 -- ----------------------------
 -- Table structure for menu
@@ -359,7 +368,7 @@ INSERT INTO `menu` VALUES ('39f08daf-8feb-d2ce-66dc-12fff451a969', 'Admin', 1, '
 INSERT INTO `menu` VALUES ('39f08daf-9b05-80d5-a7f5-21e450af9b70', 'Admin', 1, '39f08dac-9b84-9a56-20b9-26789223a74f', '角色管理', 'admin_role', '', '', '', 'role', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:33:50', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:50', '39f08d5b-177c-a334-34e7-408ef121c6e0');
 INSERT INTO `menu` VALUES ('39f08daf-a689-5e91-dce9-e6d0088d29dc', 'Admin', 1, '39f08dac-9b84-9a56-20b9-26789223a74f', '账户管理', 'admin_account', '', '', '', 'user', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:33:53', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:53', '39f08d5b-177c-a334-34e7-408ef121c6e0');
 INSERT INTO `menu` VALUES ('39f08daf-b44b-8fbf-3a88-629dc0922e84', 'Admin', 1, '39f08dac-9b84-9a56-20b9-26789223a74f', '审计日志', 'admin_auditinfo', '', '', '', 'log', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:33:57', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:57', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `menu` VALUES ('39f08daf-e02b-bd7b-be06-12eeee0f4da4', 'Admin', 1, '39f08dac-84e1-54e2-22ee-e5d7e3606f90', '系统配置', 'admin_system', '', '', '', 'system', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:34:08', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:00', '39f08d5b-177c-a334-34e7-408ef121c6e0');
+INSERT INTO `menu` VALUES ('39f08daf-e02b-bd7b-be06-12eeee0f4da4', 'Admin', 1, '39f08dac-84e1-54e2-22ee-e5d7e3606f90', '系统配置', 'admin_system', '', '', '', 'system', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:34:08', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:22', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
 INSERT INTO `menu` VALUES ('39f08daf-f8f6-2dad-42c0-c73c787c6def', 'Admin', 1, '39f08dac-84e1-54e2-22ee-e5d7e3606f90', '配置项', 'admin_config', '', '', '', 'tag', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:34:14', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-09 15:15:07', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
 INSERT INTO `menu` VALUES ('39f08db0-067d-fc37-84cb-b5283891fcce', 'Admin', 1, '39f08dac-84e1-54e2-22ee-e5d7e3606f90', '图标管理', 'admin_icon', '', '', '', 'photo', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:34:18', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-09 15:15:24', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
 INSERT INTO `menu` VALUES ('39f10ddc-b762-96c9-58a3-9ce21ae7ebcd', '', 2, '00000000-0000-0000-0000-000000000000', '官方文档', '', '', '', 'https://nm.iamoldli.com/docs', 'archives', '', 0, b'1', 3, 0, '', '', b'1', '', '2019-10-24 10:54:30', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:32:25', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
@@ -376,7 +385,7 @@ CREATE TABLE `menu_permission`  (
   `MenuCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `PermissionCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 28 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 34 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of menu_permission
@@ -396,12 +405,16 @@ INSERT INTO `menu_permission` VALUES (13, 'admin_menu', 'admin_menu_tree_get');
 INSERT INTO `menu_permission` VALUES (14, 'admin_role', 'admin_role_query_get');
 INSERT INTO `menu_permission` VALUES (15, 'admin_account', 'admin_account_query_get');
 INSERT INTO `menu_permission` VALUES (16, 'admin_auditinfo', 'admin_auditinfo_query_get');
-INSERT INTO `menu_permission` VALUES (22, 'admin_system', 'admin_system_config_post');
-INSERT INTO `menu_permission` VALUES (23, 'admin_system', 'admin_system_uploadlogo_post');
 INSERT INTO `menu_permission` VALUES (24, 'admin_config', 'admin_config_query_get');
 INSERT INTO `menu_permission` VALUES (25, 'quartz_group', 'quartz_group_query_get');
 INSERT INTO `menu_permission` VALUES (26, 'codegenerator_project', 'codegenerator_project_query_get');
 INSERT INTO `menu_permission` VALUES (27, 'codegenerator_enum', 'codegenerator_enum_query_get');
+INSERT INTO `menu_permission` VALUES (28, 'admin_system', 'admin_system_updatebaseconfig_post');
+INSERT INTO `menu_permission` VALUES (29, 'admin_system', 'admin_system_updatecomponentconfig_post');
+INSERT INTO `menu_permission` VALUES (30, 'admin_system', 'admin_system_updateloginconfig_post');
+INSERT INTO `menu_permission` VALUES (31, 'admin_system', 'admin_system_updatepermissionconfig_post');
+INSERT INTO `menu_permission` VALUES (32, 'admin_system', 'admin_system_updatetoolbarconfig_post');
+INSERT INTO `menu_permission` VALUES (33, 'admin_system', 'admin_system_uploadlogo_post');
 
 -- ----------------------------
 -- Table structure for moduleinfo
@@ -448,90 +461,95 @@ CREATE TABLE `permission`  (
 -- ----------------------------
 -- Records of permission
 -- ----------------------------
-INSERT INTO `permission` VALUES ('39f08d5b-d104-dad2-d611-3586643f34b7', '账户管理_绑定角色', 'Admin', 'Account', 'BindRole', 2, 'admin_account_bindrole_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d110-8a6f-5d0c-1acc4cd6e713', '账户管理_查询', 'Admin', 'Account', 'Query', 0, 'admin_account_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d11d-e539-b8e1-58967d8fd541', '账户管理_添加', 'Admin', 'Account', 'Add', 2, 'admin_account_add_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d131-df4d-fb47-2698f84c7cf6', '账户管理_编辑', 'Admin', 'Account', 'Edit', 0, 'admin_account_edit_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d136-91f1-39c4-eec8eb28f490', '账户管理_更新', 'Admin', 'Account', 'Update', 2, 'admin_account_update_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d149-b5a9-3e89-d13f3cedb1c6', '账户管理_删除', 'Admin', 'Account', 'Delete', 3, 'admin_account_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d158-c047-51d7-509b0606fd96', '账户管理_重置密码', 'Admin', 'Account', 'ResetPassword', 2, 'admin_account_resetpassword_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d175-9882-0f7c-fb2bae67f6c8', '审计信息_查询', 'Admin', 'AuditInfo', 'Query', 0, 'admin_auditinfo_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1ae-0b50-d74d-23ea07538398', '审计信息_详情', 'Admin', 'AuditInfo', 'Details', 0, 'admin_auditinfo_details_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1cc-e9c7-bd4d-da331764b4a3', '按钮管理_查询', 'Admin', 'Button', 'Query', 0, 'admin_button_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1d6-55c8-3580-cda4932af779', '配置项管理_查询', 'Admin', 'Config', 'Query', 0, 'admin_config_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1e0-65f2-73d4-8424438c8567', '配置项管理_添加', 'Admin', 'Config', 'Add', 2, 'admin_config_add_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1e5-9e0e-0c29-ddf2a73482b8', '配置项管理_删除', 'Admin', 'Config', 'Delete', 3, 'admin_config_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1ec-13f3-a1f5-23a2bc892d15', '配置项管理_编辑', 'Admin', 'Config', 'Edit', 0, 'admin_config_edit_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1f1-f48b-9ebe-766fcb346c63', '配置项管理_修改', 'Admin', 'Config', 'Update', 2, 'admin_config_update_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d200-dee4-a526-d3422506a692', '菜单管理_菜单树', 'Admin', 'Menu', 'Tree', 0, 'admin_menu_tree_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d210-2150-33bc-f8b9b97d2b10', '菜单管理_查询菜单列表', 'Admin', 'Menu', 'Query', 0, 'admin_menu_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d21c-40fb-6de2-3bddb3a1682a', '菜单管理_添加', 'Admin', 'Menu', 'Add', 2, 'admin_menu_add_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d225-a13c-7b44-e8c3e7d3d128', '菜单管理_删除', 'Admin', 'Menu', 'Delete', 3, 'admin_menu_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d22e-ee56-933a-ed09cfb4a706', '菜单管理_编辑', 'Admin', 'Menu', 'Edit', 0, 'admin_menu_edit_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d236-7004-f0ca-925788da03aa', '菜单管理_更新', 'Admin', 'Menu', 'Update', 2, 'admin_menu_update_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d243-8f1a-7c50-6feeb098432e', '菜单管理_更新排序信息', 'Admin', 'Menu', 'Sort', 0, 'admin_menu_sort_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d24b-cfa0-96e6-9242c9cdff31', '菜单管理_更新排序信息', 'Admin', 'Menu', 'Sort', 2, 'admin_menu_sort_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d259-2ac7-dfa6-1bf0ae78e4f0', '模块信息_查询', 'Admin', 'ModuleInfo', 'Query', 0, 'admin_moduleinfo_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d264-13cc-1cc2-a4c2639e7fda', '模块信息_同步模块数据', 'Admin', 'ModuleInfo', 'Sync', 2, 'admin_moduleinfo_sync_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d269-43b8-2d42-48a8cf8a3c38', '模块信息_删除', 'Admin', 'ModuleInfo', 'Delete', 3, 'admin_moduleinfo_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d27d-241c-b966-5a4ce019fe3e', '权限接口_查询', 'Admin', 'Permission', 'Query', 0, 'admin_permission_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d286-6b4b-82cf-b8f4c8052fef', '权限接口_同步', 'Admin', 'Permission', 'Sync', 2, 'admin_permission_sync_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d28c-73c8-d195-f2de0713cbf3', '角色管理_查询', 'Admin', 'Role', 'Query', 0, 'admin_role_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d298-0e81-694f-723d60c55bda', '角色管理_添加', 'Admin', 'Role', 'Add', 2, 'admin_role_add_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d29d-7195-e52b-5b20e346f898', '角色管理_删除', 'Admin', 'Role', 'Delete', 3, 'admin_role_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2a5-3475-50d1-d3984f82f5d3', '角色管理_编辑', 'Admin', 'Role', 'Edit', 0, 'admin_role_edit_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2aa-77a2-7f52-72d9974f7020', '角色管理_修改', 'Admin', 'Role', 'Update', 2, 'admin_role_update_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2b5-55c5-995d-17557580db07', '角色管理_获取角色的关联菜单列表', 'Admin', 'Role', 'MenuList', 0, 'admin_role_menulist_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2b8-0db7-9575-bd6cd85f12b0', '角色管理_绑定菜单', 'Admin', 'Role', 'BindMenu', 2, 'admin_role_bindmenu_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2bc-3e4d-3993-a7a34ef134af', '角色管理_获取角色关联的菜单按钮列表', 'Admin', 'Role', 'MenuButtonList', 0, 'admin_role_menubuttonlist_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2c5-438b-194f-6b5f35cb587b', '角色管理_绑定菜单按钮', 'Admin', 'Role', 'BindMenuButton', 2, 'admin_role_bindmenubutton_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d104-dad2-d611-3586643f34b7', '账户管理_绑定角色', 'Admin', 'Account', 'BindRole', 2, 'admin_account_bindrole_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d110-8a6f-5d0c-1acc4cd6e713', '账户管理_查询', 'Admin', 'Account', 'Query', 0, 'admin_account_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d11d-e539-b8e1-58967d8fd541', '账户管理_添加', 'Admin', 'Account', 'Add', 2, 'admin_account_add_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d131-df4d-fb47-2698f84c7cf6', '账户管理_编辑', 'Admin', 'Account', 'Edit', 0, 'admin_account_edit_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d136-91f1-39c4-eec8eb28f490', '账户管理_更新', 'Admin', 'Account', 'Update', 2, 'admin_account_update_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d149-b5a9-3e89-d13f3cedb1c6', '账户管理_删除', 'Admin', 'Account', 'Delete', 3, 'admin_account_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d158-c047-51d7-509b0606fd96', '账户管理_重置密码', 'Admin', 'Account', 'ResetPassword', 2, 'admin_account_resetpassword_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d175-9882-0f7c-fb2bae67f6c8', '审计信息_查询', 'Admin', 'AuditInfo', 'Query', 0, 'admin_auditinfo_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d1ae-0b50-d74d-23ea07538398', '审计信息_详情', 'Admin', 'AuditInfo', 'Details', 0, 'admin_auditinfo_details_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d1cc-e9c7-bd4d-da331764b4a3', '按钮管理_查询', 'Admin', 'Button', 'Query', 0, 'admin_button_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d1d6-55c8-3580-cda4932af779', '配置项管理_查询', 'Admin', 'Config', 'Query', 0, 'admin_config_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d1e0-65f2-73d4-8424438c8567', '配置项管理_添加', 'Admin', 'Config', 'Add', 2, 'admin_config_add_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d1e5-9e0e-0c29-ddf2a73482b8', '配置项管理_删除', 'Admin', 'Config', 'Delete', 3, 'admin_config_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d1ec-13f3-a1f5-23a2bc892d15', '配置项管理_编辑', 'Admin', 'Config', 'Edit', 0, 'admin_config_edit_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d1f1-f48b-9ebe-766fcb346c63', '配置项管理_修改', 'Admin', 'Config', 'Update', 2, 'admin_config_update_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d200-dee4-a526-d3422506a692', '菜单管理_菜单树', 'Admin', 'Menu', 'Tree', 0, 'admin_menu_tree_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d210-2150-33bc-f8b9b97d2b10', '菜单管理_查询菜单列表', 'Admin', 'Menu', 'Query', 0, 'admin_menu_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d21c-40fb-6de2-3bddb3a1682a', '菜单管理_添加', 'Admin', 'Menu', 'Add', 2, 'admin_menu_add_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d225-a13c-7b44-e8c3e7d3d128', '菜单管理_删除', 'Admin', 'Menu', 'Delete', 3, 'admin_menu_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d22e-ee56-933a-ed09cfb4a706', '菜单管理_编辑', 'Admin', 'Menu', 'Edit', 0, 'admin_menu_edit_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d236-7004-f0ca-925788da03aa', '菜单管理_更新', 'Admin', 'Menu', 'Update', 2, 'admin_menu_update_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d243-8f1a-7c50-6feeb098432e', '菜单管理_更新排序信息', 'Admin', 'Menu', 'Sort', 0, 'admin_menu_sort_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d24b-cfa0-96e6-9242c9cdff31', '菜单管理_更新排序信息', 'Admin', 'Menu', 'Sort', 2, 'admin_menu_sort_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d259-2ac7-dfa6-1bf0ae78e4f0', '模块信息_查询', 'Admin', 'ModuleInfo', 'Query', 0, 'admin_moduleinfo_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d264-13cc-1cc2-a4c2639e7fda', '模块信息_同步模块数据', 'Admin', 'ModuleInfo', 'Sync', 2, 'admin_moduleinfo_sync_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d269-43b8-2d42-48a8cf8a3c38', '模块信息_删除', 'Admin', 'ModuleInfo', 'Delete', 3, 'admin_moduleinfo_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d27d-241c-b966-5a4ce019fe3e', '权限接口_查询', 'Admin', 'Permission', 'Query', 0, 'admin_permission_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d286-6b4b-82cf-b8f4c8052fef', '权限接口_同步', 'Admin', 'Permission', 'Sync', 2, 'admin_permission_sync_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d28c-73c8-d195-f2de0713cbf3', '角色管理_查询', 'Admin', 'Role', 'Query', 0, 'admin_role_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d298-0e81-694f-723d60c55bda', '角色管理_添加', 'Admin', 'Role', 'Add', 2, 'admin_role_add_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d29d-7195-e52b-5b20e346f898', '角色管理_删除', 'Admin', 'Role', 'Delete', 3, 'admin_role_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d2a5-3475-50d1-d3984f82f5d3', '角色管理_编辑', 'Admin', 'Role', 'Edit', 0, 'admin_role_edit_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d2aa-77a2-7f52-72d9974f7020', '角色管理_修改', 'Admin', 'Role', 'Update', 2, 'admin_role_update_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d2b5-55c5-995d-17557580db07', '角色管理_获取角色的关联菜单列表', 'Admin', 'Role', 'MenuList', 0, 'admin_role_menulist_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d2b8-0db7-9575-bd6cd85f12b0', '角色管理_绑定菜单', 'Admin', 'Role', 'BindMenu', 2, 'admin_role_bindmenu_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d2bc-3e4d-3993-a7a34ef134af', '角色管理_获取角色关联的菜单按钮列表', 'Admin', 'Role', 'MenuButtonList', 0, 'admin_role_menubuttonlist_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d2c5-438b-194f-6b5f35cb587b', '角色管理_绑定菜单按钮', 'Admin', 'Role', 'BindMenuButton', 2, 'admin_role_bindmenubutton_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
 INSERT INTO `permission` VALUES ('39f08d5b-d2cd-b7a0-c335-9b298cb1a765', '系统_修改系统配置', 'Admin', 'System', 'Config', 2, 'admin_system_config_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2d4-846e-7503-ee323474339d', '系统_上传Logo', 'Admin', 'System', 'UploadLogo', 2, 'admin_system_uploadlogo_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d70-dfc7-c5ea-3e8f366da479', '实体管理_查询', 'CodeGenerator', 'Class', 'Query', 0, 'codegenerator_class_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d7b-248e-08d0-b668e367e081', '实体管理_添加', 'CodeGenerator', 'Class', 'Add', 2, 'codegenerator_class_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d81-b442-7fa2-926c19e04836', '实体管理_删除', 'CodeGenerator', 'Class', 'Delete', 3, 'codegenerator_class_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d88-78d2-ca14-d5f41f3dbd96', '实体管理_编辑', 'CodeGenerator', 'Class', 'Edit', 0, 'codegenerator_class_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d8e-6bdb-4a7b-8222bc43dde6', '实体管理_修改', 'CodeGenerator', 'Class', 'Update', 2, 'codegenerator_class_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d94-b2e3-cae1-563d920a5072', '实体管理_生成代码', 'CodeGenerator', 'Class', 'BuildCode', 0, 'codegenerator_class_buildcode_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d9a-e113-46aa-f6916583e5ab', '枚举管理_查询', 'CodeGenerator', 'Enum', 'Query', 0, 'codegenerator_enum_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7da0-2a3a-50fc-5116b3f0c98e', '枚举管理_添加', 'CodeGenerator', 'Enum', 'Add', 2, 'codegenerator_enum_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7da7-db7a-d3d4-6f44ae7d6f9c', '枚举管理_删除', 'CodeGenerator', 'Enum', 'Delete', 3, 'codegenerator_enum_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dad-fe9b-7bdf-866698d3c954', '枚举管理_编辑', 'CodeGenerator', 'Enum', 'Edit', 0, 'codegenerator_enum_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7db3-d92b-f9a2-41239eac4114', '枚举管理_修改', 'CodeGenerator', 'Enum', 'Update', 2, 'codegenerator_enum_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dbb-d157-03b2-99e38607552f', '枚举项管理_查询', 'CodeGenerator', 'EnumItem', 'Query', 0, 'codegenerator_enumitem_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dc1-e145-6b70-e6f97b3c1d31', '枚举项管理_添加', 'CodeGenerator', 'EnumItem', 'Add', 2, 'codegenerator_enumitem_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dc8-5f59-e6f5-64fc4448e9ff', '枚举项管理_删除', 'CodeGenerator', 'EnumItem', 'Delete', 3, 'codegenerator_enumitem_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dce-3613-be42-a3171afec2a9', '枚举项管理_编辑', 'CodeGenerator', 'EnumItem', 'Edit', 0, 'codegenerator_enumitem_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dd3-6338-a635-604a737aae56', '枚举项管理_修改', 'CodeGenerator', 'EnumItem', 'Update', 2, 'codegenerator_enumitem_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7ddb-5474-5952-33228a83d322', '枚举项管理_获取排序信息', 'CodeGenerator', 'EnumItem', 'Sort', 0, 'codegenerator_enumitem_sort_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7de0-9f12-bb80-281bd6527d57', '枚举项管理_更新排序信息', 'CodeGenerator', 'EnumItem', 'Sort', 2, 'codegenerator_enumitem_sort_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7de6-c1d3-7b4f-f5b8e90f4a1d', '模型属性管理_查询', 'CodeGenerator', 'ModelProperty', 'Query', 0, 'codegenerator_modelproperty_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7ded-3f1d-bf51-3c5e513e6a62', '模型属性管理_添加', 'CodeGenerator', 'ModelProperty', 'Add', 2, 'codegenerator_modelproperty_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7df3-9b33-a25b-a79ef2fd92d9', '模型属性管理_删除', 'CodeGenerator', 'ModelProperty', 'Delete', 3, 'codegenerator_modelproperty_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dfa-6e07-451f-66a104202462', '模型属性管理_编辑', 'CodeGenerator', 'ModelProperty', 'Edit', 0, 'codegenerator_modelproperty_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e00-7a13-c788-75b4d9cba809', '模型属性管理_修改', 'CodeGenerator', 'ModelProperty', 'Update', 2, 'codegenerator_modelproperty_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e05-a9ab-1bb7-e95872fcc4a5', '模型属性管理_获取排序信息', 'CodeGenerator', 'ModelProperty', 'Sort', 0, 'codegenerator_modelproperty_sort_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e0d-0bb7-22b0-a8639cf60f95', '模型属性管理_更新排序信息', 'CodeGenerator', 'ModelProperty', 'Sort', 2, 'codegenerator_modelproperty_sort_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e13-9d06-296c-2aea20a52912', '模型属性管理_修改可空状态', 'CodeGenerator', 'ModelProperty', 'UpdateNullable', 2, 'codegenerator_modelproperty_updatenullable_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e19-1a8d-f880-33d698a44d4f', '模型属性管理_获取下拉列表', 'CodeGenerator', 'ModelProperty', 'Select', 0, 'codegenerator_modelproperty_select_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e20-f64b-6256-3fd67ca21b7b', '模型属性管理_从实体中导入属性', 'CodeGenerator', 'ModelProperty', 'ImportFromEntity', 2, 'codegenerator_modelproperty_importfromentity_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e25-7e1b-3c74-0a8fa17df3a8', '项目管理_查询', 'CodeGenerator', 'Project', 'Query', 0, 'codegenerator_project_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e2c-6a4e-012d-c16fa45125fd', '项目管理_添加', 'CodeGenerator', 'Project', 'Add', 2, 'codegenerator_project_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e33-4782-5ae1-eac0a534b43b', '项目管理_删除', 'CodeGenerator', 'Project', 'Delete', 3, 'codegenerator_project_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e39-1184-c52d-c6070907ee57', '项目管理_编辑', 'CodeGenerator', 'Project', 'Edit', 0, 'codegenerator_project_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e40-fdaf-12e2-6bacb9fb9b61', '项目管理_修改', 'CodeGenerator', 'Project', 'Update', 2, 'codegenerator_project_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e46-177d-d68f-2a986a622d20', '项目管理_生成代码', 'CodeGenerator', 'Project', 'BuildCode', 2, 'codegenerator_project_buildcode_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e4f-2478-d07f-a468b921ffcc', '实体属性管理_查询', 'CodeGenerator', 'Property', 'Query', 0, 'codegenerator_property_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e56-34df-5e29-2ef3d7b05503', '实体属性管理_添加', 'CodeGenerator', 'Property', 'Add', 2, 'codegenerator_property_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e5f-a482-76f6-f044498ac081', '实体属性管理_删除', 'CodeGenerator', 'Property', 'Delete', 3, 'codegenerator_property_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e66-db50-3afa-40065fd9b8e5', '实体属性管理_编辑', 'CodeGenerator', 'Property', 'Edit', 0, 'codegenerator_property_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e6d-8b34-1c2d-eff59e252268', '实体属性管理_修改', 'CodeGenerator', 'Property', 'Update', 2, 'codegenerator_property_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e74-7b40-7391-1207895cb36a', '实体属性管理_获取属性类型下拉列表', 'CodeGenerator', 'Property', 'PropertyTypeSelect', 0, 'codegenerator_property_propertytypeselect_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e7a-3b08-fe4e-ec56986157e3', '实体属性管理_获取排序信息', 'CodeGenerator', 'Property', 'Sort', 0, 'codegenerator_property_sort_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e83-2d7c-dab5-07e0fb248723', '实体属性管理_更新排序信息', 'CodeGenerator', 'Property', 'Sort', 2, 'codegenerator_property_sort_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e89-829f-29cf-ceb718b6aefb', '实体属性管理_修改可空状态', 'CodeGenerator', 'Property', 'UpdateNullable', 2, 'codegenerator_property_updatenullable_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e91-74c1-aaa7-f64865dead3e', '实体属性管理_修改列表显示状态', 'CodeGenerator', 'Property', 'UpdateShowInList', 2, 'codegenerator_property_updateshowinlist_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e97-a1c7-5a0a-4c3bef25f4e9', '实体属性管理_获取下拉列表', 'CodeGenerator', 'Property', 'Select', 0, 'codegenerator_property_select_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f08d5b-d2d4-846e-7503-ee323474339d', '系统_上传Logo', 'Admin', 'System', 'UploadLogo', 2, 'admin_system_uploadlogo_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7d70-dfc7-c5ea-3e8f366da479', '实体管理_查询', 'CodeGenerator', 'Class', 'Query', 0, 'codegenerator_class_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7d7b-248e-08d0-b668e367e081', '实体管理_添加', 'CodeGenerator', 'Class', 'Add', 2, 'codegenerator_class_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7d81-b442-7fa2-926c19e04836', '实体管理_删除', 'CodeGenerator', 'Class', 'Delete', 3, 'codegenerator_class_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7d88-78d2-ca14-d5f41f3dbd96', '实体管理_编辑', 'CodeGenerator', 'Class', 'Edit', 0, 'codegenerator_class_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7d8e-6bdb-4a7b-8222bc43dde6', '实体管理_修改', 'CodeGenerator', 'Class', 'Update', 2, 'codegenerator_class_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7d94-b2e3-cae1-563d920a5072', '实体管理_生成代码', 'CodeGenerator', 'Class', 'BuildCode', 0, 'codegenerator_class_buildcode_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7d9a-e113-46aa-f6916583e5ab', '枚举管理_查询', 'CodeGenerator', 'Enum', 'Query', 0, 'codegenerator_enum_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7da0-2a3a-50fc-5116b3f0c98e', '枚举管理_添加', 'CodeGenerator', 'Enum', 'Add', 2, 'codegenerator_enum_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7da7-db7a-d3d4-6f44ae7d6f9c', '枚举管理_删除', 'CodeGenerator', 'Enum', 'Delete', 3, 'codegenerator_enum_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7dad-fe9b-7bdf-866698d3c954', '枚举管理_编辑', 'CodeGenerator', 'Enum', 'Edit', 0, 'codegenerator_enum_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7db3-d92b-f9a2-41239eac4114', '枚举管理_修改', 'CodeGenerator', 'Enum', 'Update', 2, 'codegenerator_enum_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7dbb-d157-03b2-99e38607552f', '枚举项管理_查询', 'CodeGenerator', 'EnumItem', 'Query', 0, 'codegenerator_enumitem_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7dc1-e145-6b70-e6f97b3c1d31', '枚举项管理_添加', 'CodeGenerator', 'EnumItem', 'Add', 2, 'codegenerator_enumitem_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7dc8-5f59-e6f5-64fc4448e9ff', '枚举项管理_删除', 'CodeGenerator', 'EnumItem', 'Delete', 3, 'codegenerator_enumitem_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7dce-3613-be42-a3171afec2a9', '枚举项管理_编辑', 'CodeGenerator', 'EnumItem', 'Edit', 0, 'codegenerator_enumitem_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7dd3-6338-a635-604a737aae56', '枚举项管理_修改', 'CodeGenerator', 'EnumItem', 'Update', 2, 'codegenerator_enumitem_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7ddb-5474-5952-33228a83d322', '枚举项管理_更新排序信息', 'CodeGenerator', 'EnumItem', 'Sort', 0, 'codegenerator_enumitem_sort_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7de0-9f12-bb80-281bd6527d57', '枚举项管理_更新排序信息', 'CodeGenerator', 'EnumItem', 'Sort', 2, 'codegenerator_enumitem_sort_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7de6-c1d3-7b4f-f5b8e90f4a1d', '模型属性管理_查询', 'CodeGenerator', 'ModelProperty', 'Query', 0, 'codegenerator_modelproperty_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7ded-3f1d-bf51-3c5e513e6a62', '模型属性管理_添加', 'CodeGenerator', 'ModelProperty', 'Add', 2, 'codegenerator_modelproperty_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7df3-9b33-a25b-a79ef2fd92d9', '模型属性管理_删除', 'CodeGenerator', 'ModelProperty', 'Delete', 3, 'codegenerator_modelproperty_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7dfa-6e07-451f-66a104202462', '模型属性管理_编辑', 'CodeGenerator', 'ModelProperty', 'Edit', 0, 'codegenerator_modelproperty_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e00-7a13-c788-75b4d9cba809', '模型属性管理_修改', 'CodeGenerator', 'ModelProperty', 'Update', 2, 'codegenerator_modelproperty_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e05-a9ab-1bb7-e95872fcc4a5', '模型属性管理_更新排序信息', 'CodeGenerator', 'ModelProperty', 'Sort', 0, 'codegenerator_modelproperty_sort_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e0d-0bb7-22b0-a8639cf60f95', '模型属性管理_更新排序信息', 'CodeGenerator', 'ModelProperty', 'Sort', 2, 'codegenerator_modelproperty_sort_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e13-9d06-296c-2aea20a52912', '模型属性管理_修改可空状态', 'CodeGenerator', 'ModelProperty', 'UpdateNullable', 2, 'codegenerator_modelproperty_updatenullable_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e19-1a8d-f880-33d698a44d4f', '模型属性管理_获取下拉列表', 'CodeGenerator', 'ModelProperty', 'Select', 0, 'codegenerator_modelproperty_select_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e20-f64b-6256-3fd67ca21b7b', '模型属性管理_从实体中导入属性', 'CodeGenerator', 'ModelProperty', 'ImportFromEntity', 2, 'codegenerator_modelproperty_importfromentity_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e25-7e1b-3c74-0a8fa17df3a8', '项目管理_查询', 'CodeGenerator', 'Project', 'Query', 0, 'codegenerator_project_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e2c-6a4e-012d-c16fa45125fd', '项目管理_添加', 'CodeGenerator', 'Project', 'Add', 2, 'codegenerator_project_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e33-4782-5ae1-eac0a534b43b', '项目管理_删除', 'CodeGenerator', 'Project', 'Delete', 3, 'codegenerator_project_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e39-1184-c52d-c6070907ee57', '项目管理_编辑', 'CodeGenerator', 'Project', 'Edit', 0, 'codegenerator_project_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e40-fdaf-12e2-6bacb9fb9b61', '项目管理_修改', 'CodeGenerator', 'Project', 'Update', 2, 'codegenerator_project_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e46-177d-d68f-2a986a622d20', '项目管理_生成代码', 'CodeGenerator', 'Project', 'BuildCode', 2, 'codegenerator_project_buildcode_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e4f-2478-d07f-a468b921ffcc', '实体属性管理_查询', 'CodeGenerator', 'Property', 'Query', 0, 'codegenerator_property_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e56-34df-5e29-2ef3d7b05503', '实体属性管理_添加', 'CodeGenerator', 'Property', 'Add', 2, 'codegenerator_property_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e5f-a482-76f6-f044498ac081', '实体属性管理_删除', 'CodeGenerator', 'Property', 'Delete', 3, 'codegenerator_property_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e66-db50-3afa-40065fd9b8e5', '实体属性管理_编辑', 'CodeGenerator', 'Property', 'Edit', 0, 'codegenerator_property_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e6d-8b34-1c2d-eff59e252268', '实体属性管理_修改', 'CodeGenerator', 'Property', 'Update', 2, 'codegenerator_property_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e74-7b40-7391-1207895cb36a', '实体属性管理_获取属性类型下拉列表', 'CodeGenerator', 'Property', 'PropertyTypeSelect', 0, 'codegenerator_property_propertytypeselect_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:13', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e7a-3b08-fe4e-ec56986157e3', '实体属性管理_更新排序信息', 'CodeGenerator', 'Property', 'Sort', 0, 'codegenerator_property_sort_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:13', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e83-2d7c-dab5-07e0fb248723', '实体属性管理_更新排序信息', 'CodeGenerator', 'Property', 'Sort', 2, 'codegenerator_property_sort_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:13', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e89-829f-29cf-ceb718b6aefb', '实体属性管理_修改可空状态', 'CodeGenerator', 'Property', 'UpdateNullable', 2, 'codegenerator_property_updatenullable_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:13', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e91-74c1-aaa7-f64865dead3e', '实体属性管理_修改列表显示状态', 'CodeGenerator', 'Property', 'UpdateShowInList', 2, 'codegenerator_property_updateshowinlist_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:13', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f10e6c-7e97-a1c7-5a0a-4c3bef25f4e9', '实体属性管理_获取下拉列表', 'CodeGenerator', 'Property', 'Select', 0, 'codegenerator_property_select_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:13', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f1e767-0992-e8f1-6243-309421f490d3', '系统_修改系统基础配置', 'Admin', 'System', 'UpdateBaseConfig', 2, 'admin_system_updatebaseconfig_post', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f1e767-09e2-82f5-39fb-2b3855bfb370', '系统_修改系统组件配置', 'Admin', 'System', 'UpdateComponentConfig', 2, 'admin_system_updatecomponentconfig_post', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f1e767-0a17-3343-3537-bfede0e024ec', '系统_修改系统登录配置', 'Admin', 'System', 'UpdateLoginConfig', 2, 'admin_system_updateloginconfig_post', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f1e767-0a37-f5b3-d4de-cd8d690609c0', '系统_修改系统权限配置', 'Admin', 'System', 'UpdatePermissionConfig', 2, 'admin_system_updatepermissionconfig_post', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
+INSERT INTO `permission` VALUES ('39f1e767-0a56-4d3a-33b0-3682eadf9e7c', '系统_修改系统权限配置', 'Admin', 'System', 'UpdateToolbarConfig', 2, 'admin_system_updatetoolbarconfig_post', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
 
 -- ----------------------------
 -- Table structure for role
diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index 501318c1eaf69f3a1c597d98d90510c0ec62b5a1..438aa4b6cd03e387b4cb73338cdbe4d6e4ee0693 100644
GIT binary patch
delta 7696
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
A!2kdN

delta 3718
zcmd5;k8>2&9pCr%c5m;pw+V^Y5MxZx<PL=kyZiR-?u(Fcxg=9W45^&)XO#*CRFV{e
zfL7&*sK}2J7xJWv5K%xt1k-Y*juzBfTCE7y+5!b(#vmd}?C9u>+P>Y*MaJ<DFq6BP
zeDisq_kG{*=lgkY(cbu?z428SDnc*EaZj?(MeMVnd!z}4-d(qjZUzBoMf2suFOCNI
zF`#~4XJ>ocEt99unLTUn+*$2y?aqPba!}a!X>+uKp8{9(1v~bF`&GL^#fb*oluR^O
zjdnuUlX^nK7#l=Sv8Z+ZNIne^Y03c`%|udfY)GUU8|o9pvQRxHm>}D}?t8!#NoY-s
z)@*7r5-ANQn{3NyBqnM-57^}HU9TmQm{<vf4K+a;k!siD1_LF@wdWySAi)VuHPu8@
zgJmX~?50LLnX;OQQQx<G&b&z?t435F=>+$d%kpb-kNk;pvwV|0vTs<y7kSReH{0Oo
zpEzZ2j21^m16<WOXT%#N^yY0K55|i7&b?W{kB-2HxkB!^AYLYZ9`1?UDsRg>3yugK
zq5YwJX-cp=zgcktPxAx(DDHT7cb}A5SQzHwnQ_j^Ls!!~OTk6*sihD1uj@Lsy08DS
zl}_)w7dRd7XwLIT6wzcQB_{1&0%FeCBipOQliWrw9;r&DQ|Y-2=iYK#d&j~#vu4cf
z{6U7z?<$N*bWXIz`i{KQ2%WCOdz>qe-|JE9Cc>KOj5t*l4L=lqh%4f(h?Yv%dAyzN
z?ap(@ZgYWxPIMd76OVvc-}3jqfW>*^xqNO^aVnKgy4XyN4{>FeRypFaOPxjki8>9(
zRBr>MS-N36!wyzmq$pu-J69ED{C?h3=S`c{Ije2PlsWU9)+0CO;|d+s7$*CzW||<h
z*M{+slBp3x+!fJr&bcEM#jBn_wR#Jy(&@FUPH$cQ;q#df9$Eik*GtZbqmBM{wvLGE
zZU>aU^+#jCOCA}Tg{Za^#w6C}rQb_*jPw5N&@e--K}NM{Bh5zGm26-6KWBp%-Vdm9
zKsv-Jt0R_NAsu3Rcty${8V-!&zyeNL!2WJi<Sqe3(^B!I@<=2_m(+r3Q7xfc6`EP2
zk{aEvMk+B7v9jOPf>833fRG<lN+X)wl-C-b4g#T0DHH4wpA}vXyurT@KZR0v_fco+
ztiRFi+dw3UsxdNEjb?g4oF4B2&(Y_$0hxtu#;LNNz_@dE>h2uaR&7LRrj<pH{bHvV
zl~A>1+LlV(!Z`bH+cOkJ7DARYqQA;{aoVn-sH&TW=3?pn4};%%+c65$(ui)+mi-_`
zXD<aihvJ56vYPKZSe4IZIzn<96_=Mvt}>iuGq!uAB3rGRI_<56F?#JIAe&o@EyFSp
zZCL}V07tJ}4)){@XAo02=rDJ)u`9st+ycYEHql%$)6pvjb6}-F#Iy}ho-Bu7@@@{L
zMS!?D)Xsh?mjl9<MzvlLV|zt^1Nw4%G1Fk@J<(QGz-8_Na=Na#v<!ICc8=a(>5%pn
zIR>U>+Y?gHDi92D`HFIRq*lHmTd)djfi9gQBGXnie_H8hkAfHcsNr^nczGXl!1h6?
zj!l(#gH2ys4gTOqb)pjF*M$Cljb9N()Uk!wAhA}_%{|~xgHRo5$aFH(V{`)rulhmF
zW(3%0UH8}^tDs@sz;xG4)_|332T22(h6x?mz;w0fw|-NU^I{#3gIzwQYG_3BDV3=g
zxYdnDCFIVrbMV)dbmbFZfd>>+6(g0lTnFQ{Zk>O2nMsFOhKjJ4=cp&aRu}7q5z%zb
z0k>CCW&L-pw~4LWPI7vzX9Ex~nFc}^N~-deBFG=-^@l$TeH*mJdZB@v7WgS&53dF{
zc6X1Zt-atSKUZ5fOp~~Ua^*ONB^!?xdEKPH+Tah5A`om6!|O)#Q{az&?nK8bc23+8
zqxBoX-v`N<?b(BxpYSwzWiX0ujJ*NL&)jplyF+maX!go6abYE0@C<m=r?d!bJ58Qp
zBCg+*OVGk5VjH<lBb&j?gGkmLME7;E_NZHOWjAb1wJk5r(r5j$DS}}bY?3CgVVvJS
z3tn`W=L-a>hUHFd_Oq>EAMk_B+!1mPZi>;f+re>vA508grI~GPwXnlqt%%rUHzW46
z_0<mWmWLFvW*96@b~W_u1VLdwbIx^Hc_%mkKw0+aE>Nj#E;t7&dKQ5|VNhz|lrJN%
z%DeM6g}Xv&se$=owL}{}1pji`WXY`7*{c8}myf1TgU^S;8o`!LGj5F@_z0Z#;z6@o
zv$1MA-7NV{XTW<ow1zdTY97h%kHJ5FApGiC@O3V%vM!mn=PvZiPr!kpxULi1b{%We
z+n~TbhT5aTV7ZVlDus~}d3at)xG+@2ZIi;{H^SM#3H~kk3fR@%y@Un{eAA-|;%Z$-
zmhNbGxOVaqg8$CN4bw1)SN8)3JTw$#S0VBZ?J$Oi{ai3}E{s@@Sy`0Dp(~j8#N$PP
z4OWVNZNfk279&$9mOs5;S@7MVux_gU#a6&^izOnbTjFI=Fp1sZbdL&O_i!T1lxf>l
z$1sKxZ675~bnkg5GQX0Z(ct>;L#bRdxL(4n8AR1AuSt;rmeV9&R^lgl;T3SNx70;3
zi^7I8;?5W?8atS~8)hcOro{~xj)Q;6<*pJ9>E1mRxl8w^v;<6GhD{IZaL}1?HS3^l
zdIL~Y3%xm&S>aV(H;L!=RIG#hTt+t1HZcuP*}KQXpjs3Ne-!GMPKt+vNBNDy2Z6Vg
z0Vc|&e0JkpSO{R=*=)8GR`GB#M?bw67Sqq?!~gQ3^e8&80L~Oo?dUzV>Op$_LU;`=
zxE_YXq((EV4P@x1Q_&yG_Ai7X2>C#E;2!uj$mY$20gxTI4`xLV9`fL(#!P15_BcJc
z1U_*d4Kn~_QSIl<CHFiC*LwfS^HyM$NynruH^X>#<wNlG;TH$DDC?9qrB<FU<KP{^
zg!r+zRlHTaOc)S$3wN^<NkaDSXW$qJCTF*9hHFG{4IRG&jsZWT9Xnt(XvwbM0cW&S
z)QQSRk+<ayc@KoI3Qd--4Nehn5N-%e<|o1lppL8SPL||n?w#Zcuq-M~OtN>KvvY3c
znht(Vu4Amix=BYYW0RT@__uRyXY-3}-%OW@{Qe=d&Tcnau?)l`+?5_}vBZR#q*npn
zvuc?M(`HR`huoEKaDs~}Eq8@gM<+wxSHFv5*5Qd@MUeM3%|u}98hg;NUeM(d?`c40
zVzU_56&t%I9}Mw-&E?3R879)*n?}jZZ*<kho(D{ADN4iqklHNGFp=jui}QHzHgzf4
zea?P-7r9U7|Ci%54Q55QUyp2rKRFcFRL$^=lO9s|L8HUf*uuKymWjPGxW&=&a=JAh
zkAhbBus8AiJKl1E;Sh1}K6g}$>U@yoRwV6wGOv<89^k#lgZv%R^{_1Suyb`k=I_3W
Hf}P<14XUUZ

diff --git a/data/SqlServer/Nm_Admin.sql b/data/SqlServer/Nm_Admin.sql
index fb4e2acf06b8dacf1c1f249f88dddaaf40cd8529..614103d3a2f4b44fd145adfd9bf09b21e0cada93 100644
GIT binary patch
delta 10193
zcmeHNYfw~27VhqgiZ~KQz<`1Si3u7(W*Fw7B#w&@OmIZOXrYmZFlZJ5LE<xFbn{Yo
z#l1kQAxf;2CaJ8e&c<s}Sqrx;D-V;XNg0>5G-i{O<r*Z$xVsT?&*^&y5WRQ&vHnO^
zY6|K;zCL{(U!OkReH-?NHtxT#wsEkPj3%kXOf1As#t<8E!G9}p$pgb9_I;EzNbkLG
zVECe7y_eAV9oao}fNyThTFDTUUt;ndjJw7RKyUggh9B>30NA}hu{p@-y>E>*(nyWn
z-2E~QmFLFf_zv1b4MlPH>omkyJ9f2^?YrgXbhEE@f}vTv<)+DzzV|ZTGVD(_PmPpY
zCxrVvp5$IeHuB@?Qiv}j$7+m9o+5#)+zum$@8;%wDc+Yf?}J`3R+31Pfgd@Y{BQt2
zQh_B&B$->5vk|_uqGLh)=yqzC%Z7)`r6oyn#qcnm){lkBM@piHk0<ltS5B%)8CgO+
zq<}0U#pEe63OF~1j3<?FSHLZYXaqkJ!5-wfQ7pXA1bA3Q=JV-x7Q=Jx%+z0dqBfLc
z5~2pH0%izgH7Nz*La6*^!Z13Dzp_CZApu05GGa)a3e5sg0l>VVO(kgI*I^3D;y*Of
zDBg612FoD}X2|c)AHaW3VG;b1opc~?sbi5r*H@ie&0||xWWP*kUP2avIqAHB(ukVY
zX|7^?z4Dovc~du+)jTY0^N@$hN)iwKl#?P*vJ|ezh$lH@IjMjrcpnd9iUCmuSEJzX
zNw}*7;a<R`Yb_Dy1<gyrCB@`f_;v5$S$-mn#zoy8D5nTiG9S2sji|8@2mH_vsMl1G
zyaIYD6&}Iy57C5o31pTqtO(vOh29XI1OF}X77=6NT1D6)Q{de)$Qm{>0<Ok`O%))o
z7!bvzkURmBmWbSvLL4>FJO!ZG#S<h0gia-yLY-28{T3RS$z=FHAFj)VxOB1r98oUF
zG8$BO3I$M#3ly=z9V+F7cG=(>bPu`>O@Z#T-c&awLqGjgyT^b_Eb{rv;YihA8bu4N
zK+)zO?}DQD<$&YLAr^(gEh<e%`)Qh9lGSh*G?mA@BWjR(OTe?$5F4atHpB;+-}AXT
zCUB51x$WIdLEB0)1=``z>)!S@GHcXM2Rdbw9DXj04(fjkwdLn750WPo$JbbaPWE3J
z{Yz%_zBy79H?O@5Mi0VVxCrtKX3AptThcT69$9_Oa~G_Jyo1fF1q(4f&xE^$WU*lQ
zG?A9EgQ6ZRMea`k942AR{>Wi$on9jzU|yaEg3{q`p-5twVT%MDq204Lipm63l{QpR
zOg6N~^o8O*pvoc`x%k9CTcQk98uRtDVj!l&9ZGl@-I5NMRYIpO(48iUJIv<lBw>ey
zX_ezX84jb$1<Cc-c>?AM{@3kv98MIz_62Tvm<6ihp0yBq&njlmR9~F3j{45tSW5#S
z?J|9#%9md^fbzQK(&I`drDJHEv2+Kq`S!i=990s6=r;=#_hQ=7m$yAan<R)9-%RNP
z^3&H%JZlIIlC!Rx`6UN4@z53Y4Vud1%IP#dU>pnMdp&d)G_Wi1s6VAHP9-*&S5(k&
zo?AgDDUYqBe`C7Z+hAf%BB|Wcm)2vwe3~Enk%sVw8rmMHjlB5xT9eqdG&3l9mU|X&
zevzi}U2AD=fW~&9rPjD9mWC+Den(CEE>@MacPXh9y-0&46UiH$gY(|TZHG6gT_0Re
zYlrB0-9{Wdu`k`K+G+kT^m}$A-PS8;!Src!c`K)Ge)Nw9s$&rXr3$A*Sv^l~q%HiL
zIyxzM&oi&DIkcgyMwPIv{w^dGgwZNFzb;;tV!i<$Z^G^`a{7g?=hW_P!gHecJqgh6
z$!&B(a6+}C@cgv$d{iNgU)V<Lbe#ZF__$+qDR!@bm<Gn18tAop6AR%Gh2R>j>MNj5
z#mrR#<r-w8&diZfnO@>9>{}9jGi~lS*&i1ExmY1|ji<y+R$&oX{Z9{F<|;m&9qGxe
zHj^xnv{Ym~Ouc5ve#^;3QF&tC#}$HEcvP)I&G4*@m}5j5#f-PCN5^fmL%j|EqUK?D
z9<eG(Y%p?8jAfewf#iKJ$in;e9bkC;dK%lW5c*sKKTv~DTTkQo!58U6y3qhK0U46{
z<`7oJ-6k5VlZLzDG}5$Ftw;XdMmnm`Yja-P@NMyzyx>(j>>l*inxqcrP#acwd0?Nq
zOz8@$f2q>-1eZM3TUM^xFbn;yV_2$KJvjMm-%&#cbi=6*Xb1xPA;E-7pb>w56CE3Z
z1DGz`G2_OXd(k0xTWH9*DlohX9Dw}3wdTl!d$oMX0}6B%4tapY6`d#@kP<Ni&a9i6
zeKGsSn(RW5<QeHP;A1M(u`vG<yAdBdL4uDW|1Psq({v+ci?osgD;6{dYZok4P+g2L
zK2ggRG)ya4_^X?!Il}u;&gJZHJ?~arpC0!#&7ZWOYWnx}_rQj?Q>bZ*kqxLJ7CL!C
zbAOSP2l{uFNq8r=75MpmG$MG@ynko+&uLqJ57h1G#Z04()SVA%p}NQ%bTAZVLaBZi
zpW8NPibqsx{Ha&z1G+PQXQ1zv4NG~`57drR)d0n`gI==g<_3$pZKLdagZ`cIwlC-r
zUQ1~_FQqW@8$YJ8yzMf5TF$>2%h#WxwYn;*B@ZM}<e~yQViTAW)<Rno6!6a$%4@ID
zE!^XvCLR*R-2Bq#EVvIYMS**KvcweL=<NP(;B5m<MO|=pNA*=JZ_ETJgIckCnanSI
z&P+1<ESzUZ>;OExDX}L+kNq(Sor_>qV#}kd#GiTEIJj!hgMayyM)J%u8qG6%v1p~C
z4{PkJlgN_AKuwiTbW|yAX>2xCq6e|JsUcd_FG{kR*{QN8lI;qFhT>4!tFT<EJQf`Y
z?T|NLu0QY;b5iBg7`E3~v_m;Jn|(|bZyflk$C|p=pVnyx1r28>jpaCTBCA&_!X)Un
zIf3n`Iy0#1Ef+~u&d+8aQYCj3d!Op;Qza9Jyu+KQWL2`AROuMa-q2S<%%;lX`_Y&`
zq_DS)krw5|Rz#W|>~&)#E`Y$U3+T>0W56!mxS|GDO@oZbjG`oVqU6Pu^-7bQea8$X
zrpR$hy~dQXiEO)Z|27#)F%5k+BapvRktxb?4;w?3moiy{v22K#6Mfb@E0A~9N?TK7
zOE!aD)H~N)7~s+8mTD{;It!epOB-~WL#53kNnakPd+1hR{}~nlqYQWnV|ugzh;JAH
z7nUe~YI}=;u7*0|Qfm4@bd+f!Yu2~iDVHBxs<>z1pgvG)q=eYy#Py-(r<{sFXiK+b
zbft<l=^Kc$EgET8EM?pDZ9}A$q@ZmuY};2Dkw9R(XN20-fkdYeo0bv6)*6i+6rCcE
zUssRuOQXuJ=h;DHrC~-=Hjl)BWV~#Y4pFjANLKUmR~uQ2QTPs@^b>byE&J5i#di7p
zIWgLSak+IYx0f!3PzzYTt8SLRIuxWdy#h4SWvIY+(>h}ZJEZRqaX{1Q>DHY_dJC+O
z+#HHoeb+9KtUIV&^5QbTKQiB9AL(n1axFqGWIrc8u!o&8R@mxyhjM5ixI));C>VCC
zG#Yu|Vec7Zk#Z_ALf&N`7%Qw&P9?^B?;GU+)B-7|j+1%K?5MF8aJH&xY&v2z%c5L$
zpGB!X%9y0f2o)%%V^!Z3AG0&Y)~N|wtr^^(v10+y{wWDaaqVQF=sEm3ga73eo5zp0
zutJ_S2bOThkFX^E_LuCeVL+Y!=1OG?J8kUBF0Az|yI^dDQ%id6YxcD<(xt$L4P=jF
z-?A$KkQ{1gQ7lC3g-1Ix>z1D@zh|v_Vl^~Qyq{41_z&Q}RX?%PPX7(%wHMh?KJps4
zGye+vLdTP;7&z=x3Zf*iB=#qENzapA*u%XMd-XpoT(3e=u~r2Rd;!_k&aN68VpWUH
zcaBN%#v);s`4KEuP6tW4iA3!@rQ5u?K3F<xtbk1mrPCyx3V>8Y37M~h8G1DpYCg4+
z-8D!$sh1x?S^04FRvfu7XbJ~QUm16A7nK<dUqFu<0&)#?fFm!h<hT$k=?-4iVGdEx
zip;BQkC${4gND|Y2Zaww$Bi|1YAlEzDYXPbs!NVDiPHUgMH=+3oC{~4QGUiE<@5Gb
zNlO}SL!_iGzU$0J7AR?M41v~4V=8D95H-&wF?~W>An_&(I;aWq@kb?-zTOsob2s(Z
zb?))fS$$`qV2fH*a~M3m$Ipi&Av>&y9dM+O0y{EZ_$5L$PzZM^a0TTTOfC2f&%3>F
z)?Ex(JG^(nlOi~r*ipx#f`6XnUWSKWye);ritiM7M>8|^`Hi;NzFfx~Vud_NTYif@
zEj)&W9b3NmAM6p`xdpeRZ2bHPw%HgW%ALJ2P&Q1Q54{$N1NZ_^9?wb&LFH7qf^-dU
z&@d;MhGyK!FdLZZRSol>=JhaaAZ`cWvL(kmO^ms17vUZm3#%wF7NdvX9~8rXjFSWI
zo$yP9UQ@sjJ6vHD3$+;cjG_%3V^@v!e>c*@*uLtaI&OG$8X3{K3388&69wSJ6cNb+
zFs=~HO9W$Za~fB6UNF%GKQs<cHB|!NZXCEmHO~LFK@a2j&IjrJ{AwMucJAQx!vOyO
zx!EL1V`#cXga?NiYU~BO{K4{qg%)^*AD>_d@660X_!vnHIURfY-}1>tSHPlf*@e1C
LL4!}fCe8dGwVGoa

delta 3154
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
W5+|60JP)9sM)!b+ds~>}jz0mr#`G}&

diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index b270e43..ee3f73e 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -7,8 +7,8 @@
   <Import Project="..\..\..\build\module.build.targets" />
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.5.5" />
-    <PackageReference Include="System.CodeDom" Version="4.6.0" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.5.6" />
+    <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index fdb787f..46e852d 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -18,15 +18,15 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.0.8",
-    "netmodular-ui": "^1.2.0"
+    "netmodular-module-admin": "^1.0.9",
+    "netmodular-ui": "^1.2.1"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.0.0",
-    "@vue/cli-plugin-eslint": "^4.0.0",
-    "@vue/cli-plugin-router": "^4.0.0",
-    "@vue/cli-plugin-vuex": "^4.0.0",
-    "@vue/cli-service": "^4.0.0",
+    "@vue/cli-plugin-babel": "^4.1.1",
+    "@vue/cli-plugin-eslint": "^4.1.1",
+    "@vue/cli-plugin-router": "^4.1.1",
+    "@vue/cli-plugin-vuex": "^4.1.1",
+    "@vue/cli-service": "^4.1.1",
     "@vue/eslint-config-prettier": "^5.0.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^5.16.0",
diff --git a/src/UI/module-code-generator/vue.config.js b/src/UI/module-code-generator/vue.config.js
index bf0ed99..6f71235 100644
--- a/src/UI/module-code-generator/vue.config.js
+++ b/src/UI/module-code-generator/vue.config.js
@@ -13,21 +13,44 @@ module.exports = {
   outputDir: outputDir,
   publicPath: '/app',
   devServer: {
-    port: 5221
+    port: 5222
   },
-  configureWebpack: {
-    plugins: [
-      /**
-       * 复制netmodular-ui/public目录下的文件到输出目录
-       */
-      new CopyWebpackPlugin([
-        {
-          from: path.join(__dirname, 'node_modules/netmodular-ui/public'),
-          to: path.join(__dirname, outputDir),
-          ignore: ['index.html']
-        }
-      ])
-    ]
+  configureWebpack() {
+    let config = {
+      plugins: [
+        /**
+         * 复制netmodular-ui/public目录下的文件到输出目录
+         */
+        new CopyWebpackPlugin([
+          {
+            from: path.join(__dirname, 'node_modules/netmodular-ui/public'),
+            to: path.join(__dirname, outputDir),
+            ignore: ['index.html']
+          }
+        ])
+      ]
+    }
+
+    if (!isDev) {
+      //自定义代码压缩
+      config.optimization = {
+        minimize: true,
+        minimizer: [
+          new TerserPlugin({
+            cache: true,
+            parallel: true,
+            sourceMap: false,
+            terserOptions: {
+              compress: {
+                drop_console: true,
+                drop_debugger: true
+              }
+            }
+          })
+        ]
+      }
+    }
+    return config
   },
   chainWebpack: config => {
     /**
@@ -55,20 +78,6 @@ module.exports = {
       )
       // 非开发环境
       .when(!isDev, config => {
-        config.optimization.minimizer([
-          new TerserPlugin({
-            cache: true,
-            parallel: true,
-            sourceMap: false, // Must be set to true if using source-maps in production
-            terserOptions: {
-              compress: {
-                drop_console: true,
-                drop_debugger: true
-              }
-            }
-          })
-        ])
-
         // 拆分
         config.optimization.splitChunks({
           chunks: 'all',
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index a7f5804..5a08a56 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.1" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.2" />
     <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.5.0" />
     <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.5.4" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.5.0" />
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index c1feb80..441d10f 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.5.6" />
     <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.5.6" />
     <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.1" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.5" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.6" />
   </ItemGroup>
 
   <ItemGroup>

From 4923f1e687957eb0ce48aefb8faf653f1f47e110 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Fri, 6 Dec 2019 17:23:22 +0800
Subject: [PATCH 12/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0.Net=20Core=20?=
 =?UTF-8?q?3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                          |  2 +-
 src/Library/Domain/Domain.csproj                   |  2 +-
 src/Library/Infrastructure/Infrastructure.csproj   |  7 ++++++-
 .../Default/T4/src/Library/Domain/Csproj.cs        |  2 +-
 .../Default/T4/src/Library/Domain/Csproj.tt        |  2 +-
 .../T4/src/Library/Infrastructure/Csproj.cs        |  2 +-
 .../T4/src/Library/Infrastructure/Csproj.tt        |  2 +-
 .../Templates/Default/T4/src/Web/Csproj.cs         | 10 +++++-----
 .../Templates/Default/T4/src/Web/Csproj.tt         | 10 +++++-----
 .../Default/T4/src/Web/ModuleInitializer.cs        | 14 +++++++++-----
 .../Default/T4/src/Web/ModuleInitializer.tt        |  6 +++++-
 .../Templates/Default/T4/src/WebHost/Csproj.cs     |  8 ++++----
 .../Templates/Default/T4/src/WebHost/Csproj.tt     |  8 ++++----
 .../_modules/CodeGenerator/_module.json            |  2 +-
 src/Web/ModuleInitializer.cs                       | 13 +++++++++----
 src/Web/Web.csproj                                 | 10 +++++-----
 src/WebHost/WebHost.csproj                         |  8 ++++----
 src/WebHost/appsettings.Development.json           | 10 ----------
 src/WebHost/appsettings.json                       |  4 ----
 19 files changed, 63 insertions(+), 59 deletions(-)
 delete mode 100644 src/WebHost/appsettings.Development.json
 delete mode 100644 src/WebHost/appsettings.json

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 89c927d..2cf565b 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
     <Id>CodeGenerator</Id>
     <Name>代码生成器</Name>
     <Authors>Oldli</Authors>
-    <Version>1.5.4</Version>
+    <Version>1.5.5</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index c6b809d..f10f436 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Data.Core" Version="1.5.6" />
     <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.6" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.5.4" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.5.6" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index ee3f73e..87cdbf9 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -7,7 +7,7 @@
   <Import Project="..\..\..\build\module.build.targets" />
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.5.6" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.5.7" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
@@ -766,6 +766,11 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Csproj.tt</DependentUpon>
     </Compile>
+    <Compile Update="Templates\Default\T4\src\Web\ModuleInitializer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ModuleInitializer.tt</DependentUpon>
+    </Compile>
   </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
index 607a2dd..c825952 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
@@ -48,7 +48,7 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Core\" Version=\"1.5.4\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n\r\n");
+            this.Write(".Lib.Utils.Core\" Version=\"1.5.6\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
index 32480e8..bd17667 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="<#= _prefix #>.Lib.Data.Core" Version="1.5.6" />
     <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.5.6" />
-    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="1.5.4" />
+    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="1.5.6" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
index debb383..a44c1f2 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
@@ -35,7 +35,7 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Module.Admin.Domain\" Version=\"1.5.5\" />\r\n  </ItemGroup>\r\n \r\n  <ItemGroup>\r\n    <" +
+            this.Write(".Module.Admin.Domain\" Version=\"1.5.7\" />\r\n  </ItemGroup>\r\n \r\n  <ItemGroup>\r\n    <" +
                     "ProjectReference Include=\"..\\Domain\\Domain.csproj\" />\r\n  </ItemGroup>\r\n\r\n</Proje" +
                     "ct>\r\n");
             return this.GenerationEnvironment.ToString();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
index 0810299..4eac79b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
@@ -8,7 +8,7 @@
   <Import Project="..\..\..\build\module.build.targets" />
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Module.Admin.Domain" Version="1.5.5" />
+    <PackageReference Include="<#= _prefix #>.Module.Admin.Domain" Version="1.5.7" />
   </ItemGroup>
  
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
index 13ef75e..c37a923 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
@@ -28,7 +28,7 @@ public virtual string TransformText()
             this.Write(@"<Project Sdk=""Microsoft.NET.Sdk"">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
@@ -40,28 +40,28 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Auth.Web\" Version=\"1.5.1\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Auth.Web\" Version=\"1.5.3\" />\r\n    <PackageReference Include=\"");
             
             #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Module.AspNetCore\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Module.AspNetCore\" Version=\"1.5.1\" />\r\n    <PackageReference Include=\"");
             
             #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Mvc\" Version=\"1.5.4\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Utils.Mvc\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
             
             #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Validation.FluentValidation\" Version=\"1.5.0\" />\r\n  </ItemGroup>\r\n\r\n  <ItemGr" +
+            this.Write(".Lib.Validation.FluentValidation\" Version=\"1.5.1\" />\r\n  </ItemGroup>\r\n\r\n  <ItemGr" +
                     "oup>\r\n    <ProjectReference Include=\"..\\Library\\Application\\Application.csproj\" " +
                     "/>\r\n  </ItemGroup>\r\n\r\n</Project>\r\n");
             return this.GenerationEnvironment.ToString();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
index 82f8c54..49b6e15 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
@@ -2,15 +2,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="<#= _prefix #>.Lib.Auth.Web" Version="1.5.1" />
-    <PackageReference Include="<#= _prefix #>.Lib.Module.AspNetCore" Version="1.5.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Utils.Mvc" Version="1.5.4" />
-    <PackageReference Include="<#= _prefix #>.Lib.Validation.FluentValidation" Version="1.5.0" />
+	<PackageReference Include="<#= _prefix #>.Lib.Auth.Web" Version="1.5.3" />
+    <PackageReference Include="<#= _prefix #>.Lib.Module.AspNetCore" Version="1.5.1" />
+    <PackageReference Include="<#= _prefix #>.Lib.Utils.Mvc" Version="1.5.6" />
+    <PackageReference Include="<#= _prefix #>.Lib.Validation.FluentValidation" Version="1.5.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
index b839d01..7f2650b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class ModuleInitializer : ModuleInitializerBase
     {
@@ -30,21 +30,21 @@ public virtual string TransformText()
                     ".DependencyInjection;\r\n#if NETCOREAPP3_0\r\nusing Microsoft.Extensions.Hosting;\r\n#" +
                     "endif\r\nusing ");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Module.AspNetCore;\r\n\r\nnamespace ");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
             
             #line default
@@ -57,7 +57,11 @@ public class ModuleInitializer : IModuleInitializer
         /// 注入服务
         /// </summary>
         /// <param name=""services""></param>
-        public void ConfigureServices(IServiceCollection services)
+#if NETSTANDARD2_0
+        public void ConfigureServices(IServiceCollection services, IHostingEnvironment env)
+#elif NETCOREAPP3_1
+        public void ConfigureServices(IServiceCollection services, IHostEnvironment env)
+#endif
         {
         }
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
index 6101e8a..ff6c4da 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
@@ -18,7 +18,11 @@ namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Web
         /// 注入服务
         /// </summary>
         /// <param name="services"></param>
-        public void ConfigureServices(IServiceCollection services)
+#if NETSTANDARD2_0
+        public void ConfigureServices(IServiceCollection services, IHostingEnvironment env)
+#elif NETCOREAPP3_1
+        public void ConfigureServices(IServiceCollection services, IHostEnvironment env)
+#endif
         {
         }
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
index a4e04bf..86e364a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
@@ -26,7 +26,7 @@ public partial class Csproj : CsprojBase
         public virtual string TransformText()
         {
             this.Write("<Project Sdk=\"Microsoft.NET.Sdk.Web\">\r\n\r\n  <PropertyGroup>\r\n    <TargetFramework>" +
-                    "netcoreapp3.0</TargetFramework>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n\t<PackageR" +
+                    "netcoreapp3.1</TargetFramework>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n\t<PackageR" +
                     "eference Include=\"");
             
             #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
@@ -34,7 +34,7 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Cache.MemoryCache\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Cache.MemoryCache\" Version=\"1.5.1\" />\r\n    <PackageReference Include=\"");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
@@ -62,14 +62,14 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Host.Web\" Version=\"1.5.1\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Host.Web\" Version=\"1.5.2\" />\r\n    <PackageReference Include=\"");
             
             #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(@".Module.Admin.Web"" Version=""1.5.5"" />
+            this.Write(@".Module.Admin.Web"" Version=""1.5.7"" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
index 622fc73..2246925 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
@@ -2,16 +2,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="<#= _prefix #>.Lib.Cache.MemoryCache" Version="1.5.0" />
+	<PackageReference Include="<#= _prefix #>.Lib.Cache.MemoryCache" Version="1.5.1" />
     <PackageReference Include="<#= _prefix #>.Lib.Data.MySql" Version="1.5.6" />
     <PackageReference Include="<#= _prefix #>.Lib.Data.SQLite" Version="1.5.6" />
     <PackageReference Include="<#= _prefix #>.Lib.Data.SqlServer" Version="1.5.6" />
-    <PackageReference Include="<#= _prefix #>.Lib.Host.Web" Version="1.5.1" />
-    <PackageReference Include="<#= _prefix #>.Module.Admin.Web" Version="1.5.5" />
+    <PackageReference Include="<#= _prefix #>.Lib.Host.Web" Version="1.5.2" />
+    <PackageReference Include="<#= _prefix #>.Module.Admin.Web" Version="1.5.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
index dfd3207..2674683 100644
--- a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
+++ b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.4"}
+{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.5"}
diff --git a/src/Web/ModuleInitializer.cs b/src/Web/ModuleInitializer.cs
index 4014f24..85b061a 100644
--- a/src/Web/ModuleInitializer.cs
+++ b/src/Web/ModuleInitializer.cs
@@ -4,7 +4,7 @@
 #endif
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 using Microsoft.Extensions.Hosting;
 #endif
 using NetModular.Lib.Module.AspNetCore;
@@ -17,7 +17,12 @@ public class ModuleInitializer : IModuleInitializer
         /// 注入服务
         /// </summary>
         /// <param name="services"></param>
-        public void ConfigureServices(IServiceCollection services)
+        /// <param name="env"></param>
+#if NETSTANDARD2_0
+        public void ConfigureServices(IServiceCollection services, IHostingEnvironment env)
+#elif NETCOREAPP3_1
+        public void ConfigureServices(IServiceCollection services, IHostEnvironment env)
+#endif
         {
         }
 
@@ -28,7 +33,7 @@ public void ConfigureServices(IServiceCollection services)
         /// <param name="env"></param>
 #if NETSTANDARD2_0
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
-#elif NETCOREAPP3_0
+#elif NETCOREAPP3_1
         public void Configure(IApplicationBuilder app, IHostEnvironment env)
 #endif
         {
@@ -40,7 +45,7 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env)
         /// <param name="mvcOptions"></param>
         public void ConfigureMvc(MvcOptions mvcOptions)
         {
-           
+
         }
     }
 }
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 5a08a56..32b5c38 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.2" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.5.0" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.5.4" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.3" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.5.1" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.5.6" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.5.1" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 441d10f..99b9d43 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.5.1" />
     <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.5.6" />
     <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.5.6" />
     <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.5.6" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.1" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.6" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.2" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/appsettings.Development.json b/src/WebHost/appsettings.Development.json
deleted file mode 100644
index 84ae5f9..0000000
--- a/src/WebHost/appsettings.Development.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "server.urls": "http://10.32.1.183:5000",
-  "Logging": {
-    "LogLevel": {
-      "Default": "Debug",
-      "System": "Information",
-      "Microsoft": "Information"
-    }
-  }
-}
diff --git a/src/WebHost/appsettings.json b/src/WebHost/appsettings.json
deleted file mode 100644
index 9099466..0000000
--- a/src/WebHost/appsettings.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "AllowedHosts": "*",
-  "server.urls": "http://10.32.1.183:5000"
-}

From 35e93bd7d3c7e1a1ffa045ba41cee8d9176fb198 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Wed, 11 Dec 2019 18:41:04 +0800
Subject: [PATCH 13/71] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Templates/Default/T4/src/Web/ModuleInitializer.cs         | 4 ++--
 .../Templates/Default/T4/src/Web/ModuleInitializer.tt         | 4 ++--
 src/UI/module-code-generator/package.json                     | 4 ++--
 .../src/views/modelProperty/components/import/index.vue       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
index 7f2650b..bc8c261 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
@@ -27,7 +27,7 @@ public virtual string TransformText()
         {
             this.Write("using Microsoft.AspNetCore.Builder;\r\n#if NETSTANDARD2_0\r\nusing Microsoft.AspNetCo" +
                     "re.Hosting;\r\n#endif\r\nusing Microsoft.AspNetCore.Mvc;\r\nusing Microsoft.Extensions" +
-                    ".DependencyInjection;\r\n#if NETCOREAPP3_0\r\nusing Microsoft.Extensions.Hosting;\r\n#" +
+                    ".DependencyInjection;\r\n#if NETCOREAPP3_1\r\nusing Microsoft.Extensions.Hosting;\r\n#" +
                     "endif\r\nusing ");
             
             #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
@@ -72,7 +72,7 @@ public void ConfigureServices(IServiceCollection services, IHostEnvironment env)
         /// <param name=""env""></param>
 #if NETSTANDARD2_0
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
-#elif NETCOREAPP3_0
+#elif NETCOREAPP3_1
         public void Configure(IApplicationBuilder app, IHostEnvironment env)
 #endif
         {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
index ff6c4da..a63b3eb 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Hosting;
 #endif
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-#if NETCOREAPP3_0
+#if NETCOREAPP3_1
 using Microsoft.Extensions.Hosting;
 #endif
 using <#= _prefix #>.Lib.Module.AspNetCore;
@@ -33,7 +33,7 @@ namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Web
         /// <param name="env"></param>
 #if NETSTANDARD2_0
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
-#elif NETCOREAPP3_0
+#elif NETCOREAPP3_1
         public void Configure(IApplicationBuilder app, IHostEnvironment env)
 #endif
         {
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index 46e852d..2dc5b06 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netmodular-module-code-generator",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Oldli",
   "license": "ISC",
   "code": "codeGenerator",
@@ -39,4 +39,4 @@
     "sass-loader": "^8.0.0",
     "vue-template-compiler": "^2.6.10"
   }
-}
+}
\ No newline at end of file
diff --git a/src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue b/src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue
index 174e728..bf32bc1 100644
--- a/src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue
+++ b/src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue
@@ -37,7 +37,7 @@ export default {
       return {
         title: `从实体中导入属性(${this.parent.name})`,
         icon: 'import',
-        width: '718px',
+        width: '803px',
         height: '600px',
         noScrollbar: true,
         loading: this.loading,

From 25eee30b2340166bc696df4ac71c70cdf9a1e1f2 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Fri, 13 Dec 2019 16:19:05 +0800
Subject: [PATCH 14/71] upgrade nuget

---
 src/Directory.Build.props                            |  2 +-
 src/Library/Application/Application.csproj           |  2 +-
 src/Library/Domain/Domain.csproj                     |  6 +++---
 src/Library/Infrastructure/Infrastructure.csproj     |  2 +-
 .../_modules/CodeGenerator/_module.json              |  2 +-
 src/UI/module-code-generator/.eslintrc.js            |  2 +-
 .../src/views/enumItem/components/edit/index.vue     | 10 +---------
 src/Web/Web.csproj                                   |  6 +++---
 src/WebHost/WebHost.csproj                           | 12 ++++++------
 9 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 2cf565b..67aacc7 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
     <Id>CodeGenerator</Id>
     <Name>代码生成器</Name>
     <Authors>Oldli</Authors>
-    <Version>1.5.5</Version>
+    <Version>1.5.6</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 620175d..e5b2726 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.6" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.9" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.5.0" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index f10f436..87a5505 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.5.6" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.6" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.5.6" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.5.9" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.9" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.5.7" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 87cdbf9..538c3de 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -7,7 +7,7 @@
   <Import Project="..\..\..\build\module.build.targets" />
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.5.7" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.5.9" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
index 2674683..0c36bd5 100644
--- a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
+++ b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.5"}
+{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.6"}
diff --git a/src/UI/module-code-generator/.eslintrc.js b/src/UI/module-code-generator/.eslintrc.js
index 2272e84..fdb479a 100644
--- a/src/UI/module-code-generator/.eslintrc.js
+++ b/src/UI/module-code-generator/.eslintrc.js
@@ -5,7 +5,7 @@ module.exports = {
   },
   extends: ['plugin:vue/essential', '@vue/prettier'],
   rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'no-console': 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
   },
   parserOptions: {
diff --git a/src/UI/module-code-generator/src/views/enumItem/components/edit/index.vue b/src/UI/module-code-generator/src/views/enumItem/components/edit/index.vue
index cd29ab8..bbd173d 100644
--- a/src/UI/module-code-generator/src/views/enumItem/components/edit/index.vue
+++ b/src/UI/module-code-generator/src/views/enumItem/components/edit/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <nm-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
+  <nm-form-dialog ref="form" v-bind="form" :visible.sync="visible_">
     <el-row>
       <el-col :span="20" :offset="1">
         <el-form-item label="所属枚举：">
@@ -45,9 +45,6 @@ export default {
           ],
           remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }]
         }
-      },
-      on: {
-        opened: this.opened
       }
     }
   },
@@ -56,11 +53,6 @@ export default {
       type: Object,
       required: true
     }
-  },
-  methods: {
-    opened() {
-      console.log(this.form)
-    }
   }
 }
 </script>
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 32b5c38..c6d5d99 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.3" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.5.1" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.5.6" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.4" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.5.2" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.5.7" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.5.1" />
   </ItemGroup>
   
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 99b9d43..1a29daa 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -5,12 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.5.1" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.5.6" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.5.6" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.5.6" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.2" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.7" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.5.2" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.5.9" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.5.9" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.5.9" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.3" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.9" />
   </ItemGroup>
 
   <ItemGroup>

From c5af26c5bf661334850b7cffbac2e3c03cd6747d Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Thu, 19 Dec 2019 11:20:06 +0800
Subject: [PATCH 15/71] upgrade nuget

---
 src/Directory.Build.props                     |   2 +-
 .../ViewModels/ClassUpdateModel.cs            |   7 +
 src/Library/Domain/Domain.csproj              |   2 +-
 .../Infrastructure/Infrastructure.csproj      |  83 +---
 .../T4/src/Library/Application/Csproj.cs      |   2 +-
 .../T4/src/Library/Application/Csproj.tt      |   2 +-
 .../Default/T4/src/Library/Domain/Csproj.cs   |   6 +-
 .../Default/T4/src/Library/Domain/Csproj.tt   |   6 +-
 .../T4/src/Library/Infrastructure/Csproj.cs   |   6 +-
 .../T4/src/Library/Infrastructure/Csproj.tt   |   2 +-
 .../Default/T4/src/UI/App/Eslintrc.cs         |   2 +-
 .../Default/T4/src/UI/App/Eslintrc.tt         |   2 +-
 .../Default/T4/src/UI/App/Package.cs          |  18 +-
 .../Default/T4/src/UI/App/Package.tt          |  18 +-
 .../UI/App/src/views/components/Add.Extend.cs |  45 --
 .../T4/src/UI/App/src/views/components/Add.cs | 443 ------------------
 .../T4/src/UI/App/src/views/components/Add.tt |  54 ---
 .../{Edit.Extend.cs => SavePage.Extend.cs}    |   6 +-
 .../views/components/{Edit.cs => SavePage.cs} |  50 +-
 .../views/components/{Edit.tt => SavePage.tt} |  13 +-
 .../T4/src/UI/App/src/views/index/Index.cs    |  70 +--
 .../T4/src/UI/App/src/views/index/Index.tt    |  41 +-
 .../Default/T4/src/UI/App/vscode/settings.cs  |   4 +-
 .../Default/T4/src/UI/App/vscode/settings.tt  |   4 +-
 .../Templates/Default/T4/src/Web/Csproj.cs    |   6 +-
 .../Templates/Default/T4/src/Web/Csproj.tt    |   6 +-
 .../Default/T4/src/WebHost/Csproj.cs          |  26 +-
 .../Default/T4/src/WebHost/Csproj.tt          |  14 +-
 .../_modules/CodeGenerator/_module.json       |   2 +-
 .../.vscode/settings.json                     |   4 +-
 src/UI/module-code-generator/package.json     |  10 +-
 .../src/views/class/components/edit/index.vue |  72 ---
 .../class/components/{add => save}/index.vue  |  34 +-
 .../src/views/class/index/index.vue           |  31 +-
 .../src/views/enum/components/add/index.vue   |  56 ---
 .../enum/components/{edit => save}/index.vue  |   9 +-
 .../src/views/enum/index/index.vue            |  29 +-
 .../views/enumItem/components/add/index.vue   |  75 ---
 .../components/{edit => save}/index.vue       |  21 +-
 .../src/views/enumItem/index/index.vue        |  24 +-
 .../modelProperty/components/add/index.vue    |   2 +-
 .../modelProperty/components/import/index.vue |   2 +-
 .../src/views/modelProperty/index/index.vue   |   2 +-
 .../views/project/components/edit/index.vue   |  51 --
 .../components/{add => save}/index.vue        |  23 +-
 .../src/views/project/index/index.vue         |  35 +-
 .../views/property/components/add/index.vue   |   2 +-
 .../src/views/property/index/index.vue        |   2 +-
 src/Web/Web.csproj                            |   2 +-
 src/WebHost/WebHost.csproj                    |   7 +-
 src/WebHost/config/excel.Development.json     |   2 +
 src/WebHost/config/excel.json                 |   6 +
 52 files changed, 244 insertions(+), 1199 deletions(-)
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.tt
 rename src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/{Edit.Extend.cs => SavePage.Extend.cs} (91%)
 rename src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/{Edit.cs => SavePage.cs} (92%)
 rename src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/{Edit.tt => SavePage.tt} (75%)
 delete mode 100644 src/UI/module-code-generator/src/views/class/components/edit/index.vue
 rename src/UI/module-code-generator/src/views/class/components/{add => save}/index.vue (80%)
 delete mode 100644 src/UI/module-code-generator/src/views/enum/components/add/index.vue
 rename src/UI/module-code-generator/src/views/enum/components/{edit => save}/index.vue (86%)
 delete mode 100644 src/UI/module-code-generator/src/views/enumItem/components/add/index.vue
 rename src/UI/module-code-generator/src/views/enumItem/components/{edit => save}/index.vue (76%)
 delete mode 100644 src/UI/module-code-generator/src/views/project/components/edit/index.vue
 rename src/UI/module-code-generator/src/views/project/components/{add => save}/index.vue (79%)
 create mode 100644 src/WebHost/config/excel.Development.json
 create mode 100644 src/WebHost/config/excel.json

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 67aacc7..4c2ae17 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
     <Id>CodeGenerator</Id>
     <Name>代码生成器</Name>
     <Authors>Oldli</Authors>
-    <Version>1.5.6</Version>
+    <Version>1.5.7</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/ClassService/ViewModels/ClassUpdateModel.cs b/src/Library/Application/ClassService/ViewModels/ClassUpdateModel.cs
index 63ad0bb..6d0045c 100644
--- a/src/Library/Application/ClassService/ViewModels/ClassUpdateModel.cs
+++ b/src/Library/Application/ClassService/ViewModels/ClassUpdateModel.cs
@@ -1,5 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using AutoMapper;
+using NetModular.Module.CodeGenerator.Domain.Class;
 
 namespace NetModular.Module.CodeGenerator.Application.ClassService.ViewModels
 {
@@ -26,6 +28,11 @@ public class ClassUpdateModel
         [Required(ErrorMessage = "请输入类名")]
         public string Remarks { get; set; }
 
+        /// <summary>
+        /// 基类类型
+        /// </summary>
+        public BaseEntityType BaseEntityType { get; set; }
+
         /// <summary>
         /// 方法
         /// </summary>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 87a5505..804e09d 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Data.Core" Version="1.5.9" />
     <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.9" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.5.7" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.5.9" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 538c3de..ea51c8e 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -7,7 +7,7 @@
   <Import Project="..\..\..\build\module.build.targets" />
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.5.9" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.5.11" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
@@ -68,13 +68,9 @@
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>Main.cs</LastGenOutput>
     </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\views\components\Edit.tt">
+    <None Update="Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Edit.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\views\components\Add.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Add.cs</LastGenOutput>
+      <LastGenOutput>SavePage.cs</LastGenOutput>
     </None>
     <None Update="Templates\Default\T4\src\UI\App\src\views\index\Cols.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
@@ -643,16 +639,6 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Page.tt</DependentUpon>
     </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\components\Add.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Add.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\components\Edit.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Edit.tt</DependentUpon>
-    </Compile>
     <Compile Update="Templates\Default\T4\src\UI\App\src\Module.*">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -710,67 +696,4 @@
     </Compile>
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Templates\Default\T4\src\Library\Application\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Domain\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\Package.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Package.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\routes\Routes.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Routes.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\components\Add.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Add.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\components\Edit.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Edit.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Index.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Index.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Page.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Page.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Web\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Web\ModuleInitializer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ModuleInitializer.tt</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
index 9559f32..97170bd 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
@@ -34,7 +34,7 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Query\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Query\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
index 14dbf01..658897f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.5.6" />
+	<PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.5.9" />
     <PackageReference Include="<#= _prefix #>.Lib.Mapper.AutoMapper" Version="1.5.0" />
   </ItemGroup>
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
index c825952..5aee2a5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
@@ -34,21 +34,21 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Core\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Core\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Query\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Query\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
             
             #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Core\" Version=\"1.5.6\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n\r\n");
+            this.Write(".Lib.Utils.Core\" Version=\"1.5.9\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
index bd17667..d7e6ef6 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Lib.Data.Core" Version="1.5.6" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.5.6" />
-    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="1.5.6" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.Core" Version="1.5.9" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.5.9" />
+    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="1.5.9" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
index a44c1f2..47351a5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
@@ -35,9 +35,9 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Module.Admin.Domain\" Version=\"1.5.7\" />\r\n  </ItemGroup>\r\n \r\n  <ItemGroup>\r\n    <" +
-                    "ProjectReference Include=\"..\\Domain\\Domain.csproj\" />\r\n  </ItemGroup>\r\n\r\n</Proje" +
-                    "ct>\r\n");
+            this.Write(".Module.Admin.Domain\" Version=\"1.5.11\" />\r\n  </ItemGroup>\r\n \r\n  <ItemGroup>\r\n    " +
+                    "<ProjectReference Include=\"..\\Domain\\Domain.csproj\" />\r\n  </ItemGroup>\r\n\r\n</Proj" +
+                    "ect>\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
index 4eac79b..d8d0ac2 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
@@ -8,7 +8,7 @@
   <Import Project="..\..\..\build\module.build.targets" />
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Module.Admin.Domain" Version="1.5.7" />
+    <PackageReference Include="<#= _prefix #>.Module.Admin.Domain" Version="1.5.11" />
   </ItemGroup>
  
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.cs
index 7bdef98..5d1f03f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.cs
@@ -32,7 +32,7 @@ public virtual string TransformText()
   },
   extends: ['plugin:vue/essential', '@vue/prettier'],
   rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'no-console': 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
   },
   parserOptions: {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.tt
index 2272e84..fdb479a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.tt
@@ -5,7 +5,7 @@ module.exports = {
   },
   extends: ['plugin:vue/essential', '@vue/prettier'],
   rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'no-console': 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
   },
   parserOptions: {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
index acc1793..b8d7d7c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
@@ -75,26 +75,26 @@ public virtual string TransformText()
     ""pub"": ""cd ../../../script && npm_publish.ps1""
   },
   ""dependencies"": {
-    ""netmodular-module-admin"": ""^1.0.8"",
-    ""netmodular-ui"": ""^1.2.0""
+    ""netmodular-module-admin"": ""^1.1.4"",
+    ""netmodular-ui"": ""^1.3.3""
   },
   ""devDependencies"": {
-    ""@vue/cli-plugin-babel"": ""^4.0.0"",
-    ""@vue/cli-plugin-eslint"": ""^4.0.0"",
-    ""@vue/cli-plugin-router"": ""^4.0.0"",
-    ""@vue/cli-plugin-vuex"": ""^4.0.0"",
-    ""@vue/cli-service"": ""^4.0.0"",
+    ""@vue/cli-plugin-babel"": ""^4.1.1"",
+    ""@vue/cli-plugin-eslint"": ""^4.1.1"",
+    ""@vue/cli-plugin-router"": ""^4.1.1"",
+    ""@vue/cli-plugin-vuex"": ""^4.1.1"",
+    ""@vue/cli-service"": ""^4.1.1"",
     ""@vue/eslint-config-prettier"": ""^5.0.0"",
     ""babel-eslint"": ""^10.0.3"",
     ""eslint"": ""^5.16.0"",
-    ""eslint-plugin-prettier"": ""^3.1.1"",
+    ""eslint-plugin-prettier"": ""^3.1.2"",
     ""eslint-plugin-vue"": ""^5.0.0"",
     ""prettier"": ""^1.18.2"",
     ""raw-loader"": ""^3.1.0"",
     ""rimraf"": ""^3.0.0"",
     ""sass"": ""^1.22.10"",
     ""sass-loader"": ""^8.0.0"",
-    ""vue-template-compiler"": ""^2.6.10""
+    ""vue-template-compiler"": ""^2.6.11""
   }
 }
 ");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
index c2b0e38..2ff85c0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
@@ -19,25 +19,25 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.0.8",
-    "netmodular-ui": "^1.2.0"
+    "netmodular-module-admin": "^1.1.4",
+    "netmodular-ui": "^1.3.3"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.0.0",
-    "@vue/cli-plugin-eslint": "^4.0.0",
-    "@vue/cli-plugin-router": "^4.0.0",
-    "@vue/cli-plugin-vuex": "^4.0.0",
-    "@vue/cli-service": "^4.0.0",
+    "@vue/cli-plugin-babel": "^4.1.1",
+    "@vue/cli-plugin-eslint": "^4.1.1",
+    "@vue/cli-plugin-router": "^4.1.1",
+    "@vue/cli-plugin-vuex": "^4.1.1",
+    "@vue/cli-service": "^4.1.1",
     "@vue/eslint-config-prettier": "^5.0.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^5.16.0",
-    "eslint-plugin-prettier": "^3.1.1",
+    "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-vue": "^5.0.0",
     "prettier": "^1.18.2",
     "raw-loader": "^3.1.0",
     "rimraf": "^3.0.0",
     "sass": "^1.22.10",
     "sass-loader": "^8.0.0",
-    "vue-template-compiler": "^2.6.10"
+    "vue-template-compiler": "^2.6.11"
   }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.Extend.cs
deleted file mode 100644
index 8107190..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.Extend.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.IO;
-using System.Linq;
-using NetModular.Lib.Utils.Core.Extensions;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App.src.views.components
-{
-    public partial class Add : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-        private ClassBuildModel _class;
-        private readonly string _prefix;
-        private readonly string _uiPrefix;
-
-        public Add(TemplateBuildModel model)
-        {
-            _model = model;
-            _prefix = _model.Project.Prefix.ToLower();
-            _uiPrefix = _model.Project.UIPrefix.ToLower();
-        }
-
-        public void Save()
-        {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
-            {
-                foreach (var classModel in _model.Project.ClassList)
-                {
-                    _class = classModel;
-                    
-                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "components/add");
-                    if (!Directory.Exists(dir))
-                        Directory.CreateDirectory(dir);
-
-                    //清空
-                    GenerationEnvironment.Clear();
-
-                    var content = TransformText();
-
-                    var filePath = Path.Combine(dir, $"index.vue");
-                    File.WriteAllText(filePath, content);
-                }
-            }
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.cs
deleted file mode 100644
index 3e0e82a..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.cs
+++ /dev/null
@@ -1,443 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     �˴����ɹ������ɡ�
-//     ����ʱ�汾: 16.0.0.0
-//  
-//     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
-//     �������ɴ��룬��Щ���Ľ��ᶪʧ��
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App.src.views.components
-{
-    using NetModular.Lib.Utils.Core.Extensions;
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class Add : AddBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("<template>\r\n  <");
-            
-            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
-            
-            #line default
-            #line hidden
-            this.Write("-form-dialog ref=\"form\" v-bind=\"form\" v-on=\"on\" :visible.sync=\"visible_\">\r\n    <e" +
-                    "l-row>\r\n      <el-col :span=\"20\" :offset=\"1\">\r\n");
-            
-            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-    foreach(var p in _class.AddModelPropertyList){ 
-            
-            #line default
-            #line hidden
-            this.Write("        <el-form-item label=\"");
-            
-            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
-            
-            #line default
-            #line hidden
-            this.Write("��\" prop=\"");
-            
-            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
-            
-            #line default
-            #line hidden
-            this.Write("\">\r\n          <el-input v-model=\"form.model.");
-            
-            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
-            
-            #line default
-            #line hidden
-            this.Write("\" clearable />\r\n        </el-form-item>\r\n");
-            
-            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-    } 
-            
-            #line default
-            #line hidden
-            this.Write("      </el-col>\r\n    </el-row>\r\n  </");
-            
-            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
-            
-            #line default
-            #line hidden
-            this.Write("-form-dialog>\r\n</template>\r\n<script>\r\nimport { mixins } from \'");
-            
-            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix.ToLower()));
-            
-            #line default
-            #line hidden
-            this.Write("-ui\'\r\n\r\nconst api = $api.");
-            
-            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.FirstCharToLower()));
-            
-            #line default
-            #line hidden
-            this.Write(".");
-            
-            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name.FirstCharToLower()));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n\r\nexport default {\r\n  mixins: [mixins.dialog],\r\n  data() {\r\n    return {\r\n     " +
-                    " form: {\r\n        title: \'����");
-            
-            #line 26 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_class.Remarks));
-            
-            #line default
-            #line hidden
-            this.Write("\',\r\n        icon: \'add\',\r\n        action: api.add,\r\n        model: {\r\n");
-            
-            #line 30 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-    for(var i = 0;i < _class.AddModelPropertyList.Count;i++){ var p=_class.AddModelPropertyList[i]; 
-            
-            #line default
-            #line hidden
-            this.Write("          /** ");
-            
-            #line 31 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
-            
-            #line default
-            #line hidden
-            this.Write(" */\r\n          ");
-            
-            #line 32 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
-            
-            #line default
-            #line hidden
-            this.Write(": \'\'");
-            
-            #line 32 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(i < _class.AddModelPropertyList.Count-1 ? "," : ""));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n");
-            
-            #line 33 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Add.tt"
-    } 
-            
-            #line default
-            #line hidden
-            this.Write(@"        },
-        rules: {}
-      },
-      on: {
-        success: this.onSuccess,
-        open: this.onOpen
-      }
-    }
-  },
-  methods: {
-    onSuccess() {
-      this.$emit('success')
-    },
-    onOpen() {
-      this.$nextTick(() => {
-        this.$refs.form.reset()
-      })
-    }
-  }
-}
-</script>
-");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class AddBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.tt
deleted file mode 100644
index a167418..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Add.tt
+++ /dev/null
@@ -1,54 +0,0 @@
-<#@ template language="C#" #>
-<#@ import namespace="NetModular.Lib.Utils.Core.Extensions" #>
-<template>
-  <<#= _uiPrefix #>-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
-    <el-row>
-      <el-col :span="20" :offset="1">
-<#    foreach(var p in _class.AddModelPropertyList){ #>
-        <el-form-item label="<#= p.Remarks #>：" prop="<#= p.CamelName #>">
-          <el-input v-model="form.model.<#= p.CamelName #>" clearable />
-        </el-form-item>
-<#    } #>
-      </el-col>
-    </el-row>
-  </<#= _uiPrefix #>-form-dialog>
-</template>
-<script>
-import { mixins } from '<#= _prefix.ToLower() #>-ui'
-
-const api = $api.<#= _model.Project.Code.FirstCharToLower() #>.<#= _class.Name.FirstCharToLower() #>
-
-export default {
-  mixins: [mixins.dialog],
-  data() {
-    return {
-      form: {
-        title: '添加<#= _class.Remarks #>',
-        icon: 'add',
-        action: api.add,
-        model: {
-<#    for(var i = 0;i < _class.AddModelPropertyList.Count;i++){ var p=_class.AddModelPropertyList[i]; #>
-          /** <#= p.Remarks #> */
-          <#= p.CamelName #>: ''<#=i < _class.AddModelPropertyList.Count-1 ? "," : "" #>
-<#    } #>
-        },
-        rules: {}
-      },
-      on: {
-        success: this.onSuccess,
-        open: this.onOpen
-      }
-    }
-  },
-  methods: {
-    onSuccess() {
-      this.$emit('success')
-    },
-    onOpen() {
-      this.$nextTick(() => {
-        this.$refs.form.reset()
-      })
-    }
-  }
-}
-</script>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs
similarity index 91%
rename from src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.Extend.cs
rename to src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs
index 0f71874..38f6988 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs
@@ -5,14 +5,14 @@
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App.src.views.components
 {
-    public partial class Edit : ITemplateHandler
+    public partial class SavePage : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
         private ClassBuildModel _class;
         private readonly string _prefix;
         private readonly string _uiPrefix;
 
-        public Edit(TemplateBuildModel model)
+        public SavePage(TemplateBuildModel model)
         {
             _model = model;
             _prefix = _model.Project.Prefix.ToLower();
@@ -27,7 +27,7 @@ public void Save()
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "components/edit");
+                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "components/save");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.cs
similarity index 92%
rename from src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.cs
rename to src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.cs
index fb8460b..eb0be51 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.cs
@@ -16,9 +16,9 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class Edit : EditBase
+    public partial class SavePage : SavePageBase
     {
 #line hidden
         /// <summary>
@@ -28,114 +28,114 @@ public virtual string TransformText()
         {
             this.Write("<template>\r\n  <");
             
-            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
             this.Write("-form-dialog ref=\"form\" v-bind=\"form\" v-on=\"on\" :visible.sync=\"visible_\">\r\n    <e" +
-                    "l-row>\r\n      <el-col :span=\"20\" :offset=\"1\">\r\n");
+                    "l-row>\r\n      <el-col :span=\"20\" :offset=\"1\">\r\n      ");
             
-            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
     foreach(var p in _class.EditModelPropertyList){ 
             
             #line default
             #line hidden
             this.Write("        <el-form-item label=\"");
             
-            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
             
             #line default
             #line hidden
             this.Write("��\" prop=\"");
             
-            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
             this.Write("\">\r\n          <el-input v-model=\"form.model.");
             
-            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
-            this.Write("\" clearable />\r\n        </el-form-item>\r\n");
+            this.Write("\" clearable />\r\n        </el-form-item>\r\n      ");
             
-            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
     } 
             
             #line default
             #line hidden
             this.Write("      </el-col>\r\n    </el-row>\r\n  </");
             
-            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
             this.Write("-form-dialog>\r\n</template>\r\n<script>\r\nimport { mixins } from \'");
             
-            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix.ToLower()));
             
             #line default
             #line hidden
-            this.Write("-ui\'\r\n\r\nconst api = $api.");
+            this.Write("-ui\'\r\n\r\nconst { add, edit, update } = $api.");
             
-            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.FirstCharToLower()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name.FirstCharToLower()));
             
             #line default
             #line hidden
-            this.Write("\r\n\r\nexport default {\r\n  mixins: [mixins.formDialogEdit],\r\n  data() {\r\n    return " +
-                    "{\r\n      api,\r\n      form: {\r\n        title: \'�༭");
+            this.Write("\r\n\r\nexport default {\r\n  mixins: [mixins.formSave],\r\n  data() {\r\n    return {\r\n   " +
+                    "   title: \'");
             
-            #line 27 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 25 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Remarks));
             
             #line default
             #line hidden
-            this.Write("\',\r\n        action: api.update,\r\n        model: {\r\n");
+            this.Write("\',\r\n      actions: { add, edit, update },\r\n      form: {\r\n        model: {\r\n");
             
-            #line 30 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 29 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
     for(var i = 0;i < _class.EditModelPropertyList.Count;i++){ var p = _class.EditModelPropertyList[i]; 
             
             #line default
             #line hidden
             this.Write("          /** ");
             
-            #line 31 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 30 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
             
             #line default
             #line hidden
             this.Write(" */\r\n          ");
             
-            #line 32 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 31 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
             this.Write(": \'\'");
             
-            #line 32 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 31 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(i < _class.EditModelPropertyList.Count-1 ? "," : ""));
             
             #line default
             #line hidden
             this.Write("\r\n");
             
-            #line 33 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\Edit.tt"
+            #line 32 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
     } 
             
             #line default
@@ -152,7 +152,7 @@ public virtual string TransformText()
     /// Base class for this transformation
     /// </summary>
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class EditBase
+    public class SavePageBase
     {
         #region Fields
         private global::System.Text.StringBuilder generationEnvironmentField;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.tt
similarity index 75%
rename from src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.tt
rename to src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.tt
index daddce5..338d7cc 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/Edit.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.tt
@@ -4,11 +4,11 @@
   <<#= _uiPrefix #>-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
     <el-row>
       <el-col :span="20" :offset="1">
-<#    foreach(var p in _class.EditModelPropertyList){ #>
+      <#    foreach(var p in _class.EditModelPropertyList){ #>
         <el-form-item label="<#= p.Remarks #>：" prop="<#= p.CamelName #>">
           <el-input v-model="form.model.<#= p.CamelName #>" clearable />
         </el-form-item>
-<#    } #>
+      <#    } #>
       </el-col>
     </el-row>
   </<#= _uiPrefix #>-form-dialog>
@@ -16,16 +16,15 @@
 <script>
 import { mixins } from '<#= _prefix.ToLower() #>-ui'
 
-const api = $api.<#= _model.Project.Code.FirstCharToLower() #>.<#= _class.Name.FirstCharToLower() #>
+const { add, edit, update } = $api.<#= _model.Project.Code.FirstCharToLower() #>.<#= _class.Name.FirstCharToLower() #>
 
 export default {
-  mixins: [mixins.formDialogEdit],
+  mixins: [mixins.formSave],
   data() {
     return {
-      api,
+      title: '<#= _class.Remarks #>',
+      actions: { add, edit, update },
       form: {
-        title: '编辑<#= _class.Remarks #>',
-        action: api.update,
         model: {
 <#    for(var i = 0;i < _class.EditModelPropertyList.Count;i++){ var p = _class.EditModelPropertyList[i]; #>
           /** <#= p.Remarks #> */
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
index 16c41ab..96f1ab5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
@@ -41,14 +41,14 @@ public virtual string TransformText()
             #line default
             #line hidden
             this.Write("-list ref=\"list\" v-bind=\"list\">\r\n      <!--��ѯ����-->\r\n      <template v-slot:queryb" +
-                    "ar>\r\n");
+                    "ar> \r\n        ");
             
             #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
-    foreach(var p in _class.QueryModelPropertyList){ 
+ foreach(var p in _class.QueryModelPropertyList){ 
             
             #line default
             #line hidden
-            this.Write("        <el-form-item label=\"");
+            this.Write("          <el-form-item label=\"");
             
             #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
@@ -62,14 +62,14 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("\">\r\n          <el-input v-model=\"list.model.");
+            this.Write("\">\r\n            <el-input v-model=\"list.model.");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
-            this.Write("\" clearable />\r\n        </el-form-item>\r\n");
+            this.Write("\" clearable />\r\n          </el-form-item>\r\n        ");
             
             #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
     } 
@@ -115,93 +115,69 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("-list>\r\n\r\n    <!--����-->\r\n    <add-page :visible.sync=\"dialog.add\" @success=\"refre" +
-                    "sh\" />\r\n    <!--�༭-->\r\n    <edit-page :id=\"curr.id\" :visible.sync=\"dialog.edit\" " +
-                    "@success=\"refresh\" />\r\n  </");
+            this.Write("-list>\r\n\r\n    <save-page :id=\"curr.id\" :visible.sync=\"dialog.save\" @success=\"refr" +
+                    "esh\" />\r\n  </");
             
-            #line 36 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 33 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
             
             #line default
             #line hidden
-            this.Write("-container>\r\n</template>\r\n<script>\r\nimport page from \'./page\'\r\nimport cols from \'" +
-                    "./cols\'\r\nimport AddPage from \'../components/add\'\r\nimport EditPage from \'../compo" +
-                    "nents/edit\'\r\n\r\nconst api = $api.");
+            this.Write("-container>\r\n</template>\r\n<script>\r\nimport { mixins } from \'netmodular-ui\'\r\nimpor" +
+                    "t page from \'./page\'\r\nimport cols from \'./cols\'\r\nimport SavePage from \'../compon" +
+                    "ents/save\'\r\n\r\nconst api = $api.");
             
-            #line 44 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 41 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.FirstCharToLower()));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 44 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 41 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name.FirstCharToLower()));
             
             #line default
             #line hidden
-            this.Write("\r\n\r\nexport default {\r\n  name: page.name,\r\n  components: { AddPage, EditPage },\r\n " +
-                    " data() {\r\n    return {\r\n      curr: { id: \'\' },\r\n      list: {\r\n        title: " +
-                    "page.title,\r\n        cols,\r\n        action: api.query,\r\n        model: {\r\n");
+            this.Write("\r\n\r\nexport default {\r\n  name: page.name,\r\n  mixins: [mixins.list],\r\n  components:" +
+                    " { SavePage },\r\n  data() {\r\n    return {\r\n      list: {\r\n        title: page.tit" +
+                    "le,\r\n        cols,\r\n        action: api.query,\r\n        model: {\r\n");
             
-            #line 57 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 54 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
     for(var i=0;i<_class.QueryModelPropertyList.Count;i++){ var p=_class.QueryModelPropertyList[i]; 
             
             #line default
             #line hidden
             this.Write("          /** ");
             
-            #line 58 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 55 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
             
             #line default
             #line hidden
             this.Write(" */\r\n          ");
             
-            #line 59 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 56 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
             this.Write(": \'\'");
             
-            #line 59 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 56 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(i < _class.QueryModelPropertyList.Count-1 ? "," : ""));
             
             #line default
             #line hidden
             this.Write("\r\n");
             
-            #line 60 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
+            #line 57 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
     } 
             
             #line default
             #line hidden
-            this.Write(@"        }
-      },
-      removeAction: api.remove,
-      dialog: {
-        add: false,
-        edit: false
-      },
-      buttons: page.buttons
-    }
-  },
-  methods: {
-    refresh() {
-      this.$refs.list.refresh()
-    },
-    add() {
-      this.dialog.add = true
-    },
-    edit(row) {
-      this.curr = row
-      this.dialog.edit = true
-    }
-  }
-}
-</script>
-");
+            this.Write("        }\r\n      },\r\n      removeAction: api.remove,\r\n      buttons: page.buttons" +
+                    "\r\n    }\r\n  }\r\n}\r\n</script>\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
index 48b91f6..69cebea 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
@@ -4,12 +4,12 @@
   <<#= _uiPrefix #>-container>
     <<#= _uiPrefix #>-list ref="list" v-bind="list">
       <!--查询条件-->
-      <template v-slot:querybar>
-<#    foreach(var p in _class.QueryModelPropertyList){ #>
-        <el-form-item label="<#= p.Remarks #>：" prop="<#= p.CamelName #>">
-          <el-input v-model="list.model.<#= p.CamelName #>" clearable />
-        </el-form-item>
-<#    } #>
+      <template v-slot:querybar> 
+        <# foreach(var p in _class.QueryModelPropertyList){ #>
+          <el-form-item label="<#= p.Remarks #>：" prop="<#= p.CamelName #>">
+            <el-input v-model="list.model.<#= p.CamelName #>" clearable />
+          </el-form-item>
+        <#    } #>
       </template>
 
       <!--按钮-->
@@ -29,26 +29,23 @@
       </template>
     </<#= _uiPrefix #>-list>
 
-    <!--添加-->
-    <add-page :visible.sync="dialog.add" @success="refresh" />
-    <!--编辑-->
-    <edit-page :id="curr.id" :visible.sync="dialog.edit" @success="refresh" />
+    <save-page :id="curr.id" :visible.sync="dialog.save" @success="refresh" />
   </<#= _uiPrefix #>-container>
 </template>
 <script>
+import { mixins } from 'netmodular-ui'
 import page from './page'
 import cols from './cols'
-import AddPage from '../components/add'
-import EditPage from '../components/edit'
+import SavePage from '../components/save'
 
 const api = $api.<#= _model.Project.Code.FirstCharToLower() #>.<#= _class.Name.FirstCharToLower() #>
 
 export default {
   name: page.name,
-  components: { AddPage, EditPage },
+  mixins: [mixins.list],
+  components: { SavePage },
   data() {
     return {
-      curr: { id: '' },
       list: {
         title: page.title,
         cols,
@@ -61,24 +58,8 @@ export default {
         }
       },
       removeAction: api.remove,
-      dialog: {
-        add: false,
-        edit: false
-      },
       buttons: page.buttons
     }
-  },
-  methods: {
-    refresh() {
-      this.$refs.list.refresh()
-    },
-    add() {
-      this.dialog.add = true
-    },
-    edit(row) {
-      this.curr = row
-      this.dialog.edit = true
-    }
   }
 }
 </script>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.cs
index 5587339..a22f533 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.cs
@@ -30,9 +30,9 @@ public virtual string TransformText()
   ""editor.formatOnPaste"": true,
   ""editor.formatOnSave"": true,
   ""editor.formatOnType"": true,
-  ""eslint.autoFixOnSave"": true,
   ""editor.codeActionsOnSave"": {
-    ""source.fixAll.tslint"": true
+    ""source.fixAll.tslint"": true,
+    ""source.fixAll.eslint"": true
   }
 }");
             return this.GenerationEnvironment.ToString();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.tt
index cdf590e..642a30f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.tt
@@ -3,8 +3,8 @@
   "editor.formatOnPaste": true,
   "editor.formatOnSave": true,
   "editor.formatOnType": true,
-  "eslint.autoFixOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.tslint": true
+    "source.fixAll.tslint": true,
+    "source.fixAll.eslint": true
   }
 }
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
index c37a923..ad72b29 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
@@ -40,21 +40,21 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Auth.Web\" Version=\"1.5.3\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Auth.Web\" Version=\"1.5.4\" />\r\n    <PackageReference Include=\"");
             
             #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Module.AspNetCore\" Version=\"1.5.1\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Module.AspNetCore\" Version=\"1.5.2\" />\r\n    <PackageReference Include=\"");
             
             #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Mvc\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Utils.Mvc\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
             
             #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
index 49b6e15..a09579e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="<#= _prefix #>.Lib.Auth.Web" Version="1.5.3" />
-    <PackageReference Include="<#= _prefix #>.Lib.Module.AspNetCore" Version="1.5.1" />
-    <PackageReference Include="<#= _prefix #>.Lib.Utils.Mvc" Version="1.5.6" />
+	<PackageReference Include="<#= _prefix #>.Lib.Auth.Web" Version="1.5.4" />
+    <PackageReference Include="<#= _prefix #>.Lib.Module.AspNetCore" Version="1.5.2" />
+    <PackageReference Include="<#= _prefix #>.Lib.Utils.Mvc" Version="1.5.9" />
     <PackageReference Include="<#= _prefix #>.Lib.Validation.FluentValidation" Version="1.5.1" />
   </ItemGroup>
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
index 86e364a..0708d4a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
@@ -34,42 +34,56 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Cache.MemoryCache\" Version=\"1.5.1\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Cache.MemoryCache\" Version=\"1.5.3\" />\r\n    <PackageReference Include=\"");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.MySql\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.MySql\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
             
             #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.SQLite\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.SQLite\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
             
             #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.SqlServer\" Version=\"1.5.6\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.SqlServer\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
             
             #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Host.Web\" Version=\"1.5.2\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Excel.EPPlus\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
             
             #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(@".Module.Admin.Web"" Version=""1.5.7"" />
+            this.Write(".Lib.Host.Web\" Version=\"1.5.4\" />\r\n    <PackageReference Include=\"");
+            
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            
+            #line default
+            #line hidden
+            this.Write(".Lib.Utils.Core\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
+            
+            #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            
+            #line default
+            #line hidden
+            this.Write(@".Module.Admin.Web"" Version=""1.5.11"" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
index 2246925..2320b7a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
@@ -6,12 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="<#= _prefix #>.Lib.Cache.MemoryCache" Version="1.5.1" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.MySql" Version="1.5.6" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.SQLite" Version="1.5.6" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.SqlServer" Version="1.5.6" />
-    <PackageReference Include="<#= _prefix #>.Lib.Host.Web" Version="1.5.2" />
-    <PackageReference Include="<#= _prefix #>.Module.Admin.Web" Version="1.5.7" />
+	<PackageReference Include="<#= _prefix #>.Lib.Cache.MemoryCache" Version="1.5.3" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.MySql" Version="1.5.9" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.SQLite" Version="1.5.9" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.SqlServer" Version="1.5.9" />
+    <PackageReference Include="<#= _prefix #>.Lib.Excel.EPPlus" Version="1.5.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Host.Web" Version="1.5.4" />
+    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="1.5.9" />
+    <PackageReference Include="<#= _prefix #>.Module.Admin.Web" Version="1.5.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
index 0c36bd5..3afa00e 100644
--- a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
+++ b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.6"}
+{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.7"}
diff --git a/src/UI/module-code-generator/.vscode/settings.json b/src/UI/module-code-generator/.vscode/settings.json
index 212273d..df7a9ea 100644
--- a/src/UI/module-code-generator/.vscode/settings.json
+++ b/src/UI/module-code-generator/.vscode/settings.json
@@ -3,8 +3,8 @@
   "editor.formatOnPaste": true,
   "editor.formatOnSave": true,
   "editor.formatOnType": true,
-  "eslint.autoFixOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.tslint": true
+    "source.fixAll.tslint": true,
+    "source.fixAll.eslint": true
   }
 }
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index 2dc5b06..7247959 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netmodular-module-code-generator",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "author": "Oldli",
   "license": "ISC",
   "code": "codeGenerator",
@@ -18,8 +18,8 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.0.9",
-    "netmodular-ui": "^1.2.1"
+    "netmodular-module-admin": "^1.1.4",
+    "netmodular-ui": "^1.3.3"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.1.1",
@@ -30,13 +30,13 @@
     "@vue/eslint-config-prettier": "^5.0.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^5.16.0",
-    "eslint-plugin-prettier": "^3.1.1",
+    "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-vue": "^5.0.0",
     "prettier": "^1.18.2",
     "raw-loader": "^3.1.0",
     "rimraf": "^3.0.0",
     "sass": "^1.22.10",
     "sass-loader": "^8.0.0",
-    "vue-template-compiler": "^2.6.10"
+    "vue-template-compiler": "^2.6.11"
   }
 }
\ No newline at end of file
diff --git a/src/UI/module-code-generator/src/views/class/components/edit/index.vue b/src/UI/module-code-generator/src/views/class/components/edit/index.vue
deleted file mode 100644
index 59e1e82..0000000
--- a/src/UI/module-code-generator/src/views/class/components/edit/index.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-  <nm-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
-    <el-row>
-      <el-col :span="20" :offset="1">
-        <el-form-item label="所属项目：">
-          <el-input v-model="project.name" disabled />
-        </el-form-item>
-        <el-form-item label="实体名称：" prop="name">
-          <el-input v-model="form.model.name" />
-        </el-form-item>
-        <el-form-item label="表名：" prop="tableName">
-          <el-input v-model="form.model.tableName" />
-        </el-form-item>
-        <el-form-item label="备注：" prop="remarks">
-          <el-input v-model="form.model.remarks" />
-        </el-form-item>
-        <el-form-item label="基础方法：" prop="method">
-          <el-checkbox v-model="form.model.method.add">Add</el-checkbox>
-          <el-checkbox v-model="form.model.method.delete">Delete</el-checkbox>
-          <el-checkbox v-model="form.model.method.edit">Edit</el-checkbox>
-          <el-checkbox v-model="form.model.method.query">Query</el-checkbox>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </nm-form-dialog>
-</template>
-<script>
-import { mixins } from 'netmodular-ui'
-
-const api = $api.codeGenerator.class
-
-export default {
-  mixins: [mixins.formDialogEdit],
-  data() {
-    return {
-      api,
-      form: {
-        title: '编辑实体',
-        width: '40%',
-        action: api.update,
-        model: {
-          id: '',
-          name: '',
-          tableName: '',
-          remarks: '',
-          method: {
-            query: true,
-            add: true,
-            delete: true,
-            edit: true
-          }
-        },
-        rules: {
-          name: [{ required: true, message: '请输入实体名称', trigger: 'blur' }],
-          tableName: [{ required: true, message: '请输入表名', trigger: 'blur' }],
-          remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }]
-        }
-      },
-      on: {
-        success: this.onSuccess,
-        open: this.onOpen
-      }
-    }
-  },
-  props: {
-    project: {
-      type: Object,
-      required: true
-    }
-  }
-}
-</script>
diff --git a/src/UI/module-code-generator/src/views/class/components/add/index.vue b/src/UI/module-code-generator/src/views/class/components/save/index.vue
similarity index 80%
rename from src/UI/module-code-generator/src/views/class/components/add/index.vue
rename to src/UI/module-code-generator/src/views/class/components/save/index.vue
index eb427ce..285a13d 100644
--- a/src/UI/module-code-generator/src/views/class/components/add/index.vue
+++ b/src/UI/module-code-generator/src/views/class/components/save/index.vue
@@ -5,15 +5,15 @@
         <el-form-item label="所属项目：">
           <el-input v-model="project.name" disabled />
         </el-form-item>
+        <el-form-item label="基类类型：" prop="baseEntityType">
+          <nm-select :disabled="isEdit_" :method="getBaseEntityTypeSelect" v-model="form.model.baseEntityType" />
+        </el-form-item>
         <el-form-item label="实体名称：" prop="name">
           <el-input v-model="form.model.name" />
         </el-form-item>
         <el-form-item label="表名：" prop="tableName">
           <el-input v-model="form.model.tableName" />
         </el-form-item>
-        <el-form-item label="基类类型：" prop="baseEntityType">
-          <nm-select :method="getBaseEntityTypeSelect" v-model="form.model.baseEntityType" />
-        </el-form-item>
         <el-form-item label="备注：" prop="remarks">
           <el-input v-model="form.model.remarks" />
         </el-form-item>
@@ -30,17 +30,20 @@
 <script>
 import { mixins } from 'netmodular-ui'
 
-const api = $api.codeGenerator.class
+const { add, edit, update, getBaseEntityTypeSelect } = $api.codeGenerator.class
 
 export default {
-  mixins: [mixins.dialog],
+  mixins: [mixins.formSave],
   data() {
     return {
+      title: '实体',
+      actions: {
+        add,
+        edit,
+        update
+      },
       form: {
-        title: '添加实体',
-        icon: 'add',
         width: '40%',
-        action: api.add,
         model: {
           projectId: '',
           name: '',
@@ -62,8 +65,7 @@ export default {
         }
       },
       on: {
-        success: this.onSuccess,
-        open: this.onOpen
+        reset: this.onReset
       }
     }
   },
@@ -75,16 +77,10 @@ export default {
   },
   methods: {
     getBaseEntityTypeSelect() {
-      return api.getBaseEntityTypeSelect()
-    },
-    onSuccess() {
-      this.$emit('success')
+      return getBaseEntityTypeSelect()
     },
-    onOpen() {
-      this.$nextTick(() => {
-        this.$refs.form.reset()
-        this.form.model.projectId = this.project.id
-      })
+    onReset() {
+      this.form.model.projectId = this.project.id
     }
   }
 }
diff --git a/src/UI/module-code-generator/src/views/class/index/index.vue b/src/UI/module-code-generator/src/views/class/index/index.vue
index a0c0db3..7a59f17 100644
--- a/src/UI/module-code-generator/src/views/class/index/index.vue
+++ b/src/UI/module-code-generator/src/views/class/index/index.vue
@@ -20,8 +20,8 @@
         <nm-button-delete :action="removeAction" :id="row.id" @success="refresh" />
       </template>
     </nm-list>
-    <add-page :project="project" :visible.sync="dialog.add" @success="refresh" />
-    <edit-page :id="curr.id" :project="project" :visible.sync="dialog.edit" @success="refresh" />
+
+    <save-page :id="curr.id" :project="project" :visible.sync="dialog.save" @success="refresh" />
     <property-page :parent="curr" :visible.sync="dialog.property" />
     <model-manage-page :parent="curr" :visible.sync="dialog.model" />
     <code-preview :id="curr.id" :visible.sync="dialog.codePreview" />
@@ -30,8 +30,7 @@
 <script>
 import { mixins } from 'netmodular-ui'
 import cols from './cols.js'
-import AddPage from '../components/add'
-import EditPage from '../components/edit'
+import SavePage from '../components/save'
 import PropertyPage from '../../property/index'
 import ModelManagePage from '../../modelProperty/index'
 import CodePreview from '../components/code-preview'
@@ -39,15 +38,15 @@ import CodePreview from '../components/code-preview'
 const api = $api.codeGenerator.class
 
 export default {
-  mixins: [mixins.dialog, mixins.loading],
-  components: { AddPage, EditPage, PropertyPage, ModelManagePage, CodePreview },
+  mixins: [mixins.visible, mixins.list],
+  components: { SavePage, PropertyPage, ModelManagePage, CodePreview },
   data() {
     return {
-      curr: { id: '' },
       list: {
         noHeader: true,
         queryOnCreated: false,
         action: api.query,
+        operationWidth: '400',
         model: {
           projectId: '',
           name: ''
@@ -55,8 +54,6 @@ export default {
         cols
       },
       dialog: {
-        add: false,
-        edit: false,
         property: false,
         model: false,
         codePreview: false
@@ -80,16 +77,6 @@ export default {
     }
   },
   methods: {
-    refresh() {
-      this.$refs.list.refresh()
-    },
-    add() {
-      this.dialog.add = true
-    },
-    edit(row) {
-      this.curr = row
-      this.dialog.edit = true
-    },
     /** 打开模型管理 */
     openModelManage(row) {
       this.curr = row
@@ -100,14 +87,14 @@ export default {
       this.dialog.property = true
     },
     buildCode(row) {
-      let loading = this._loading('正在努力生成代码，请稍后...')
+      this._openLoading('正在努力生成代码，请稍后...')
       api
         .buildCode(row.id)
         .then(() => {
-          loading.close()
+          this._closeLoading()
         })
         .catch(() => {
-          loading.close()
+          this._closeLoading()
         })
     },
     codePreview(row) {
diff --git a/src/UI/module-code-generator/src/views/enum/components/add/index.vue b/src/UI/module-code-generator/src/views/enum/components/add/index.vue
deleted file mode 100644
index d50bd7d..0000000
--- a/src/UI/module-code-generator/src/views/enum/components/add/index.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-  <nm-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
-    <el-row>
-      <el-col :span="20" :offset="1">
-        <el-form-item label="名称：" prop="name">
-          <el-input v-model="form.model.name" />
-        </el-form-item>
-        <el-form-item label="备注：" prop="remarks">
-          <el-input v-model="form.model.remarks" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </nm-form-dialog>
-</template>
-<script>
-import { mixins } from 'netmodular-ui'
-
-const api = $api.codeGenerator.enum
-
-export default {
-  mixins: [mixins.dialog],
-  data() {
-    return {
-      form: {
-        title: '添加枚举',
-        icon: 'add',
-        width: '30%',
-        action: api.add,
-        labelWidth: '70px',
-        model: {
-          name: '',
-          remarks: ''
-        },
-        rules: {
-          name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-          remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }]
-        }
-      },
-      on: {
-        success: this.onSuccess,
-        open: this.onOpen
-      }
-    }
-  },
-  methods: {
-    onSuccess() {
-      this.$emit('success')
-    },
-    onOpen() {
-      this.$nextTick(() => {
-        this.$refs.form.reset()
-      })
-    }
-  }
-}
-</script>
diff --git a/src/UI/module-code-generator/src/views/enum/components/edit/index.vue b/src/UI/module-code-generator/src/views/enum/components/save/index.vue
similarity index 86%
rename from src/UI/module-code-generator/src/views/enum/components/edit/index.vue
rename to src/UI/module-code-generator/src/views/enum/components/save/index.vue
index c716b23..9499ca4 100644
--- a/src/UI/module-code-generator/src/views/enum/components/edit/index.vue
+++ b/src/UI/module-code-generator/src/views/enum/components/save/index.vue
@@ -15,17 +15,16 @@
 <script>
 import { mixins } from 'netmodular-ui'
 
-const api = $api.codeGenerator.enum
+const { add, edit, update } = $api.codeGenerator.enum
 
 export default {
-  mixins: [mixins.formDialogEdit],
+  mixins: [mixins.formSave],
   data() {
     return {
-      api,
+      title: '项目',
+      actions: { add, edit, update },
       form: {
-        title: '编辑项目',
         width: '30%',
-        action: api.update,
         labelWidth: '70px',
         model: {
           name: '',
diff --git a/src/UI/module-code-generator/src/views/enum/index/index.vue b/src/UI/module-code-generator/src/views/enum/index/index.vue
index 4891d99..3cceea3 100644
--- a/src/UI/module-code-generator/src/views/enum/index/index.vue
+++ b/src/UI/module-code-generator/src/views/enum/index/index.vue
@@ -27,29 +27,26 @@
       </template>
     </nm-list>
 
-    <!--添加-->
-    <add-page :visible.sync="dialog.add" @success="refresh" />
-    <!--编辑-->
-    <edit-page :id="curr.id" :visible.sync="dialog.edit" @success="refresh" />
+    <save-page :id="curr.id" :visible.sync="dialog.save" @success="refresh" />
     <!--项管理-->
     <item-page :parent="curr" :visible.sync="dialog.item" />
   </nm-container>
 </template>
 <script>
+import { mixins } from 'netmodular-ui'
 import page from './page'
 import cols from './cols'
-import AddPage from '../components/add'
-import EditPage from '../components/edit'
+import SavePage from '../components/save'
 import ItemPage from '../../enumItem/index'
 
 const api = $api.codeGenerator.enum
 
 export default {
   name: page.name,
-  components: { AddPage, EditPage, ItemPage },
+  mixins: [mixins.list],
+  components: { SavePage, ItemPage },
   data() {
     return {
-      curr: { id: '' },
       list: {
         title: page.title,
         cols,
@@ -59,25 +56,13 @@ export default {
         }
       },
       removeAction: api.remove,
+      buttons: page.buttons,
       dialog: {
-        add: false,
-        edit: false,
         item: false
-      },
-      buttons: page.buttons
+      }
     }
   },
   methods: {
-    refresh() {
-      this.$refs.list.refresh()
-    },
-    add() {
-      this.dialog.add = true
-    },
-    edit(row) {
-      this.curr = row
-      this.dialog.edit = true
-    },
     manageItem(row) {
       this.curr = row
       this.dialog.item = true
diff --git a/src/UI/module-code-generator/src/views/enumItem/components/add/index.vue b/src/UI/module-code-generator/src/views/enumItem/components/add/index.vue
deleted file mode 100644
index 43ed1d2..0000000
--- a/src/UI/module-code-generator/src/views/enumItem/components/add/index.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <nm-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
-    <el-row>
-      <el-col :span="20" :offset="1">
-        <el-form-item label="所属枚举：">
-          <el-input :value="`${parent.remarks}(${parent.name})`" disabled />
-        </el-form-item>
-        <el-form-item label="名称：" prop="name">
-          <el-input v-model="form.model.name" />
-        </el-form-item>
-        <el-form-item label="值：" prop="value">
-          <el-input v-model.number="form.model.value" />
-        </el-form-item>
-        <el-form-item label="备注：" prop="remarks">
-          <el-input v-model="form.model.remarks" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </nm-form-dialog>
-</template>
-<script>
-import { mixins } from 'netmodular-ui'
-
-const api = $api.codeGenerator.enumItem
-
-export default {
-  mixins: [mixins.dialog],
-  data() {
-    return {
-      form: {
-        title: '添加类',
-        icon: 'add',
-        width: '40%',
-        action: api.add,
-        model: {
-          enumId: '',
-          name: '',
-          value: '',
-          remarks: ''
-        },
-        rules: {
-          enumId: [{ required: true, message: '请选择枚举', trigger: 'blur' }],
-          name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-          value: [
-            { required: true, message: '请输入值', trigger: 'blur' },
-            { type: 'number', message: '请输入值', trigger: 'blur' }
-          ],
-          remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }]
-        }
-      },
-      on: {
-        success: this.onSuccess,
-        open: this.onOpen
-      }
-    }
-  },
-  props: {
-    parent: {
-      type: Object,
-      required: true
-    }
-  },
-  methods: {
-    onSuccess() {
-      this.$emit('success')
-    },
-    onOpen() {
-      this.$nextTick(() => {
-        this.$refs.form.reset()
-        this.form.model.enumId = this.parent.id
-      })
-    }
-  }
-}
-</script>
diff --git a/src/UI/module-code-generator/src/views/enumItem/components/edit/index.vue b/src/UI/module-code-generator/src/views/enumItem/components/save/index.vue
similarity index 76%
rename from src/UI/module-code-generator/src/views/enumItem/components/edit/index.vue
rename to src/UI/module-code-generator/src/views/enumItem/components/save/index.vue
index bbd173d..6c2a5a2 100644
--- a/src/UI/module-code-generator/src/views/enumItem/components/edit/index.vue
+++ b/src/UI/module-code-generator/src/views/enumItem/components/save/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <nm-form-dialog ref="form" v-bind="form" :visible.sync="visible_">
+  <nm-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
     <el-row>
       <el-col :span="20" :offset="1">
         <el-form-item label="所属枚举：">
@@ -21,18 +21,18 @@
 <script>
 import { mixins } from 'netmodular-ui'
 
-const api = $api.codeGenerator.enumItem
+const { add, edit, update } = $api.codeGenerator.enumItem
 
 export default {
-  mixins: [mixins.formDialogEdit],
+  mixins: [mixins.formSave],
   data() {
     return {
-      api,
+      title: '枚举项',
+      actions: { add, edit, update },
       form: {
-        title: '编辑枚举项',
         width: '40%',
-        action: api.update,
         model: {
+          enumId: '',
           name: '',
           value: '',
           remarks: ''
@@ -45,6 +45,9 @@ export default {
           ],
           remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }]
         }
+      },
+      on: {
+        reset: this.onReset
       }
     }
   },
@@ -53,6 +56,12 @@ export default {
       type: Object,
       required: true
     }
+  },
+  methods: {
+    onReset() {
+      console.log(this.parent)
+      this.form.model.enumId = this.parent.id
+    }
   }
 }
 </script>
diff --git a/src/UI/module-code-generator/src/views/enumItem/index/index.vue b/src/UI/module-code-generator/src/views/enumItem/index/index.vue
index fce2a75..b0103df 100644
--- a/src/UI/module-code-generator/src/views/enumItem/index/index.vue
+++ b/src/UI/module-code-generator/src/views/enumItem/index/index.vue
@@ -17,25 +17,23 @@
         <nm-button-delete :action="removeAction" :id="row.id" @success="refresh" />
       </template>
     </nm-list>
-    <add-page :parent="parent" :visible.sync="dialog.add" @success="refresh" />
-    <edit-page :id="curr.id" :parent="parent" :visible.sync="dialog.edit" @success="refresh" />
+
+    <save-page :id="curr.id" :parent="parent" :visible.sync="dialog.save" @success="refresh" />
     <nm-drag-sort-dialog v-bind="dragSort" :visible.sync="dialog.sort" @success="refresh" />
   </nm-list-dialog>
 </template>
 <script>
 import { mixins } from 'netmodular-ui'
 import cols from './cols.js'
-import AddPage from '../components/add'
-import EditPage from '../components/edit'
+import SavePage from '../components/save'
 
 const api = $api.codeGenerator.enumItem
 
 export default {
-  mixins: [mixins.dialog],
-  components: { AddPage, EditPage },
+  mixins: [mixins.list, mixins.visible],
+  components: { SavePage },
   data() {
     return {
-      curr: { id: '' },
       list: {
         noHeader: true,
         queryOnCreated: false,
@@ -47,8 +45,6 @@ export default {
         cols
       },
       dialog: {
-        add: false,
-        edit: false,
         sort: false
       },
       removeAction: api.remove
@@ -69,16 +65,6 @@ export default {
     }
   },
   methods: {
-    refresh() {
-      this.$refs.list.refresh()
-    },
-    add() {
-      this.dialog.add = true
-    },
-    edit(row) {
-      this.curr = row
-      this.dialog.edit = true
-    },
     openSort() {
       this.dialog.sort = true
     },
diff --git a/src/UI/module-code-generator/src/views/modelProperty/components/add/index.vue b/src/UI/module-code-generator/src/views/modelProperty/components/add/index.vue
index 14bc1b9..cab2dbd 100644
--- a/src/UI/module-code-generator/src/views/modelProperty/components/add/index.vue
+++ b/src/UI/module-code-generator/src/views/modelProperty/components/add/index.vue
@@ -36,7 +36,7 @@ const api = $api.codeGenerator.modelProperty
 const enumApi = $api.codeGenerator.enum
 
 export default {
-  mixins: [mixins.dialog],
+  mixins: [mixins.visible],
   components: { TypeSelect, EnumSelect },
   data() {
     // 验证枚举
diff --git a/src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue b/src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue
index bf32bc1..57feb2d 100644
--- a/src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue
+++ b/src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue
@@ -13,7 +13,7 @@ const api = $api.codeGenerator.modelProperty
 const propertyApi = $api.codeGenerator.property
 
 export default {
-  mixins: [mixins.dialog],
+  mixins: [mixins.visible],
   data() {
     return {
       list: [],
diff --git a/src/UI/module-code-generator/src/views/modelProperty/index/index.vue b/src/UI/module-code-generator/src/views/modelProperty/index/index.vue
index 5651136..488d810 100644
--- a/src/UI/module-code-generator/src/views/modelProperty/index/index.vue
+++ b/src/UI/module-code-generator/src/views/modelProperty/index/index.vue
@@ -25,7 +25,7 @@
 import { mixins } from 'netmodular-ui'
 import ListPage from '../components/list'
 export default {
-  mixins: [mixins.dialog],
+  mixins: [mixins.visible],
   components: { ListPage },
   data() {
     return {
diff --git a/src/UI/module-code-generator/src/views/project/components/edit/index.vue b/src/UI/module-code-generator/src/views/project/components/edit/index.vue
deleted file mode 100644
index ed5413b..0000000
--- a/src/UI/module-code-generator/src/views/project/components/edit/index.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-  <nm-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
-    <el-row>
-      <el-col :span="20" :offset="1">
-        <el-form-item label="名称：" prop="name">
-          <el-input v-model="form.model.name" />
-        </el-form-item>
-        <el-form-item label="编号：" prop="no">
-          <el-input v-model.number="form.model.no" />
-        </el-form-item>
-        <el-form-item label="编码：" prop="code">
-          <el-input v-model="form.model.code" />
-        </el-form-item>
-        <el-form-item label="版权声明：" prop="copyright">
-          <el-input v-model="form.model.copyright" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </nm-form-dialog>
-</template>
-<script>
-import { mixins } from 'netmodular-ui'
-
-const api = $api.codeGenerator.project
-
-export default {
-  mixins: [mixins.formDialogEdit],
-  data() {
-    return {
-      api,
-      form: {
-        title: '编辑项目',
-        width: '30%',
-        action: api.update,
-        labelWidth: '120px',
-        model: {
-          name: '',
-          no: 0,
-          code: '',
-          copyright: ''
-        },
-        rules: {
-          name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-          code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
-          copyright: [{ required: true, message: '请输入版权声明', trigger: 'blur' }]
-        }
-      }
-    }
-  }
-}
-</script>
diff --git a/src/UI/module-code-generator/src/views/project/components/add/index.vue b/src/UI/module-code-generator/src/views/project/components/save/index.vue
similarity index 79%
rename from src/UI/module-code-generator/src/views/project/components/add/index.vue
rename to src/UI/module-code-generator/src/views/project/components/save/index.vue
index ff7b805..c8b35e9 100644
--- a/src/UI/module-code-generator/src/views/project/components/add/index.vue
+++ b/src/UI/module-code-generator/src/views/project/components/save/index.vue
@@ -22,17 +22,16 @@
 <script>
 import { mixins } from 'netmodular-ui'
 
-const api = $api.codeGenerator.project
+const { add, edit, update } = $api.codeGenerator.project
 
 export default {
-  mixins: [mixins.dialog],
+  mixins: [mixins.formSave],
   data() {
     return {
+      title: '项目',
+      actions: { add, edit, update },
       form: {
-        title: '添加项目',
-        icon: 'add',
         width: '30%',
-        action: api.add,
         labelWidth: '120px',
         model: {
           name: '',
@@ -45,22 +44,8 @@ export default {
           code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
           copyright: [{ required: true, message: '请输入版权声明', trigger: 'blur' }]
         }
-      },
-      on: {
-        success: this.onSuccess,
-        open: this.onOpen
       }
     }
-  },
-  methods: {
-    onSuccess() {
-      this.$emit('success')
-    },
-    onOpen() {
-      this.$nextTick(() => {
-        this.$refs.form.reset()
-      })
-    }
   }
 }
 </script>
diff --git a/src/UI/module-code-generator/src/views/project/index/index.vue b/src/UI/module-code-generator/src/views/project/index/index.vue
index eb96f0d..fbf3b4d 100644
--- a/src/UI/module-code-generator/src/views/project/index/index.vue
+++ b/src/UI/module-code-generator/src/views/project/index/index.vue
@@ -28,10 +28,7 @@
       </template>
     </nm-list>
 
-    <!--添加-->
-    <add-page :visible.sync="dialog.add" @success="refresh" />
-    <!--编辑-->
-    <edit-page :id="curr.id" :visible.sync="dialog.edit" @success="refresh" />
+    <save-page :id="curr.id" :visible.sync="dialog.save" @success="refresh" />
     <!--类管理-->
     <class-page :project="curr" :visible.sync="dialog.class" />
   </nm-container>
@@ -40,19 +37,17 @@
 import { mixins } from 'netmodular-ui'
 import page from './page'
 import cols from './cols'
-import AddPage from '../components/add'
-import EditPage from '../components/edit'
+import SavePage from '../components/save'
 import ClassPage from '../../class/index'
 
 const api = $api.codeGenerator.project
 
 export default {
   name: page.name,
-  mixins: [mixins.loading],
-  components: { AddPage, EditPage, ClassPage },
+  mixins: [mixins.list],
+  components: { SavePage, ClassPage },
   data() {
     return {
-      curr: { id: '' },
       list: {
         title: page.title,
         cols,
@@ -63,34 +58,22 @@ export default {
         }
       },
       removeAction: api.remove,
+      buttons: page.buttons,
       dialog: {
-        add: false,
-        edit: false,
         class: false
-      },
-      buttons: page.buttons
+      }
     }
   },
   methods: {
-    refresh() {
-      this.$refs.list.refresh()
-    },
-    add() {
-      this.dialog.add = true
-    },
-    edit(row) {
-      this.curr = row
-      this.dialog.edit = true
-    },
     buildCode(row) {
-      let loading = this._loading('正在努力生成代码，请稍后...')
+      this._openLoading('正在努力生成代码，请稍后...')
       api
         .buildCode({ id: row.id })
         .then(() => {
-          loading.close()
+          this._closenLoading()
         })
         .catch(() => {
-          loading.close()
+          this._closenLoading()
         })
     },
     manageClass(row) {
diff --git a/src/UI/module-code-generator/src/views/property/components/add/index.vue b/src/UI/module-code-generator/src/views/property/components/add/index.vue
index 172ffb0..a7be1ed 100644
--- a/src/UI/module-code-generator/src/views/property/components/add/index.vue
+++ b/src/UI/module-code-generator/src/views/property/components/add/index.vue
@@ -63,7 +63,7 @@ const api = $api.codeGenerator.property
 const enumApi = $api.codeGenerator.enum
 
 export default {
-  mixins: [mixins.dialog],
+  mixins: [mixins.visible],
   components: { TypeSelect, EnumSelect },
   data() {
     // 验证字符串长度
diff --git a/src/UI/module-code-generator/src/views/property/index/index.vue b/src/UI/module-code-generator/src/views/property/index/index.vue
index ea8ce24..2fec3ba 100644
--- a/src/UI/module-code-generator/src/views/property/index/index.vue
+++ b/src/UI/module-code-generator/src/views/property/index/index.vue
@@ -50,7 +50,7 @@ import EditPage from '../components/edit'
 const api = $api.codeGenerator.property
 
 export default {
-  mixins: [mixins.dialog],
+  mixins: [mixins.visible],
   components: { AddPage, EditPage },
   data() {
     return {
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index c6d5d99..f1ab2cc 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.4" />
     <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.5.2" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.5.7" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.5.9" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.5.1" />
   </ItemGroup>
   
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 1a29daa..076c6f3 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -5,12 +5,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.5.2" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.5.3" />
     <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.5.9" />
     <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.5.9" />
     <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.5.9" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.3" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.9" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.4" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/config/excel.Development.json b/src/WebHost/config/excel.Development.json
new file mode 100644
index 0000000..7a73a41
--- /dev/null
+++ b/src/WebHost/config/excel.Development.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/src/WebHost/config/excel.json b/src/WebHost/config/excel.json
new file mode 100644
index 0000000..c6f93d0
--- /dev/null
+++ b/src/WebHost/config/excel.json
@@ -0,0 +1,6 @@
+{
+  //Excel������ 0��EPPlus 1��NPOI 2��OpenXml
+  "Provider": 0,
+  //Excel�����ʱ�ļ�·�����ƣ�Ĭ��Excel����Ŀ¼�����ȫ�ֵ���ʱĿ¼��
+  "TempPath": ""
+}
\ No newline at end of file

From 894c5b90cb7acee93165276bfca2abfb309dab96 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Tue, 24 Dec 2019 21:49:17 +0800
Subject: [PATCH 16/71] =?UTF-8?q?=E6=B7=BB=E5=8A=A0excel.json=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                     |   2 +-
 .../Infrastructure/Infrastructure.csproj      |  22 ++
 .../T4/src/WebHost/config/excel.Extend.cs     |  26 ++
 .../Default/T4/src/WebHost/config/excel.cs    | 308 ++++++++++++++++++
 .../Default/T4/src/WebHost/config/excel.tt    |   7 +
 .../WebHost/config/excelDevelopment.Extend.cs |  26 ++
 .../T4/src/WebHost/config/excelDevelopment.cs | 307 +++++++++++++++++
 .../T4/src/WebHost/config/excelDevelopment.tt |   2 +
 .../_modules/CodeGenerator/_module.json       |   2 +-
 src/UI/module-code-generator/package.json     |   2 +-
 src/WebHost/Properties/launchSettings.json    |  17 +-
 11 files changed, 702 insertions(+), 19 deletions(-)
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.Extend.cs
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.cs
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.tt
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.Extend.cs
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.cs
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.tt

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 4c2ae17..2881668 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
     <Id>CodeGenerator</Id>
     <Name>代码生成器</Name>
     <Authors>Oldli</Authors>
-    <Version>1.5.7</Version>
+    <Version>1.5.8</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index ea51c8e..7b0e2e7 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -228,6 +228,10 @@
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>cacheDevelopment.cs</LastGenOutput>
     </None>
+    <None Update="Templates\Default\T4\src\WebHost\config\excelDevelopment.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>excelDevelopment.cs</LastGenOutput>
+    </None>
     <None Update="Templates\Default\T4\src\Web\Csproj.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>Csproj.cs</LastGenOutput>
@@ -312,6 +316,14 @@
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>Prettierrc.cs</LastGenOutput>
     </None>
+    <None Update="Templates\Default\T4\src\WebHost\config\excel.tt">
+      <Generator>TextTemplatingFilePreprocessor</Generator>
+      <LastGenOutput>excel.cs</LastGenOutput>
+    </None>
+    <None Update="Templates\Default\T4\src\WebHost\config\excelDevelopment.tt">
+      <Generator>TextTemplatingFilePreprocessor</Generator>
+      <LastGenOutput>excelDevelopment.cs</LastGenOutput>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
@@ -694,6 +706,16 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Prettierrc.tt</DependentUpon>
     </Compile>
+    <Compile Update="Templates\Default\T4\src\WebHost\config\excel.*">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>excel.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\WebHost\config\excelDevelopment.*">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>excelDevelopment.tt</DependentUpon>
+    </Compile>
   </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.Extend.cs
new file mode 100644
index 0000000..8c17372
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.Extend.cs
@@ -0,0 +1,26 @@
+using System.IO;
+using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
+{
+    public partial class excel : ITemplateHandler
+    {
+        private readonly TemplateBuildModel _model;
+
+        public excel(TemplateBuildModel model)
+        {
+            _model = model;
+        }
+
+        public void Save()
+        {
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
+            if (!Directory.Exists(dir))
+                Directory.CreateDirectory(dir);
+
+            var content = TransformText();
+            var filePath = Path.Combine(dir, "excel.json");
+            File.WriteAllText(filePath, content);
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.cs
new file mode 100644
index 0000000..47a7a6f
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.cs
@@ -0,0 +1,308 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     �˴����ɹ������ɡ�
+//     ����ʱ�汾: 16.0.0.0
+//  
+//     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
+//     �������ɴ��룬��Щ���Ľ��ᶪʧ��
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
+{
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\excel.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public partial class excel : excelBase
+    {
+#line hidden
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public virtual string TransformText()
+        {
+            this.Write("{\r\n  //Excel������ 0��EPPlus 1��NPOI 2��OpenXml\r\n  \"Provider\": 0,\r\n  //Excel�����ʱ�ļ�·�����ƣ�" +
+                    "Ĭ��Excel����Ŀ¼�����ȫ�ֵ���ʱĿ¼��\r\n  \"TempPath\": \"\"\r\n}");
+            return this.GenerationEnvironment.ToString();
+        }
+    }
+    
+    #line default
+    #line hidden
+    #region Base class
+    /// <summary>
+    /// Base class for this transformation
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public class excelBase
+    {
+        #region Fields
+        private global::System.Text.StringBuilder generationEnvironmentField;
+        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
+        private global::System.Collections.Generic.List<int> indentLengthsField;
+        private string currentIndentField = "";
+        private bool endsWithNewline;
+        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
+        #endregion
+        #region Properties
+        /// <summary>
+        /// The string builder that generation-time code is using to assemble generated output
+        /// </summary>
+        protected System.Text.StringBuilder GenerationEnvironment
+        {
+            get
+            {
+                if ((this.generationEnvironmentField == null))
+                {
+                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
+                }
+                return this.generationEnvironmentField;
+            }
+            set
+            {
+                this.generationEnvironmentField = value;
+            }
+        }
+        /// <summary>
+        /// The error collection for the generation process
+        /// </summary>
+        public System.CodeDom.Compiler.CompilerErrorCollection Errors
+        {
+            get
+            {
+                if ((this.errorsField == null))
+                {
+                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
+                }
+                return this.errorsField;
+            }
+        }
+        /// <summary>
+        /// A list of the lengths of each indent that was added with PushIndent
+        /// </summary>
+        private System.Collections.Generic.List<int> indentLengths
+        {
+            get
+            {
+                if ((this.indentLengthsField == null))
+                {
+                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
+                }
+                return this.indentLengthsField;
+            }
+        }
+        /// <summary>
+        /// Gets the current indent we use when adding lines to the output
+        /// </summary>
+        public string CurrentIndent
+        {
+            get
+            {
+                return this.currentIndentField;
+            }
+        }
+        /// <summary>
+        /// Current transformation session
+        /// </summary>
+        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
+        {
+            get
+            {
+                return this.sessionField;
+            }
+            set
+            {
+                this.sessionField = value;
+            }
+        }
+        #endregion
+        #region Transform-time helpers
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void Write(string textToAppend)
+        {
+            if (string.IsNullOrEmpty(textToAppend))
+            {
+                return;
+            }
+            // If we're starting off, or if the previous text ended with a newline,
+            // we have to append the current indent first.
+            if (((this.GenerationEnvironment.Length == 0) 
+                        || this.endsWithNewline))
+            {
+                this.GenerationEnvironment.Append(this.currentIndentField);
+                this.endsWithNewline = false;
+            }
+            // Check if the current text ends with a newline
+            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
+            {
+                this.endsWithNewline = true;
+            }
+            // This is an optimization. If the current indent is "", then we don't have to do any
+            // of the more complex stuff further down.
+            if ((this.currentIndentField.Length == 0))
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+                return;
+            }
+            // Everywhere there is a newline in the text, add an indent after it
+            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
+            // If the text ends with a newline, then we should strip off the indent added at the very end
+            // because the appropriate indent will be added when the next time Write() is called
+            if (this.endsWithNewline)
+            {
+                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
+            }
+            else
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+            }
+        }
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void WriteLine(string textToAppend)
+        {
+            this.Write(textToAppend);
+            this.GenerationEnvironment.AppendLine();
+            this.endsWithNewline = true;
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void Write(string format, params object[] args)
+        {
+            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void WriteLine(string format, params object[] args)
+        {
+            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Raise an error
+        /// </summary>
+        public void Error(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Raise a warning
+        /// </summary>
+        public void Warning(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            error.IsWarning = true;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Increase the indent
+        /// </summary>
+        public void PushIndent(string indent)
+        {
+            if ((indent == null))
+            {
+                throw new global::System.ArgumentNullException("indent");
+            }
+            this.currentIndentField = (this.currentIndentField + indent);
+            this.indentLengths.Add(indent.Length);
+        }
+        /// <summary>
+        /// Remove the last indent that was added with PushIndent
+        /// </summary>
+        public string PopIndent()
+        {
+            string returnValue = "";
+            if ((this.indentLengths.Count > 0))
+            {
+                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
+                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
+                if ((indentLength > 0))
+                {
+                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
+                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
+                }
+            }
+            return returnValue;
+        }
+        /// <summary>
+        /// Remove any indentation
+        /// </summary>
+        public void ClearIndent()
+        {
+            this.indentLengths.Clear();
+            this.currentIndentField = "";
+        }
+        #endregion
+        #region ToString Helpers
+        /// <summary>
+        /// Utility class to produce culture-oriented representation of an object as a string.
+        /// </summary>
+        public class ToStringInstanceHelper
+        {
+            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
+            /// <summary>
+            /// Gets or sets format provider to be used by ToStringWithCulture method.
+            /// </summary>
+            public System.IFormatProvider FormatProvider
+            {
+                get
+                {
+                    return this.formatProviderField ;
+                }
+                set
+                {
+                    if ((value != null))
+                    {
+                        this.formatProviderField  = value;
+                    }
+                }
+            }
+            /// <summary>
+            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
+            /// </summary>
+            public string ToStringWithCulture(object objectToConvert)
+            {
+                if ((objectToConvert == null))
+                {
+                    throw new global::System.ArgumentNullException("objectToConvert");
+                }
+                System.Type t = objectToConvert.GetType();
+                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
+                            typeof(System.IFormatProvider)});
+                if ((method == null))
+                {
+                    return objectToConvert.ToString();
+                }
+                else
+                {
+                    return ((string)(method.Invoke(objectToConvert, new object[] {
+                                this.formatProviderField })));
+                }
+            }
+        }
+        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
+        /// <summary>
+        /// Helper to produce culture-oriented representation of an object as a string
+        /// </summary>
+        public ToStringInstanceHelper ToStringHelper
+        {
+            get
+            {
+                return this.toStringHelperField;
+            }
+        }
+        #endregion
+    }
+    #endregion
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.tt
new file mode 100644
index 0000000..d5221e1
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.tt
@@ -0,0 +1,7 @@
+<#@ template language="C#" #>
+{
+  //Excel������ 0��EPPlus 1��NPOI 2��OpenXml
+  "Provider": 0,
+  //Excel�����ʱ�ļ�·�����ƣ�Ĭ��Excel����Ŀ¼�����ȫ�ֵ���ʱĿ¼��
+  "TempPath": ""
+}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.Extend.cs
new file mode 100644
index 0000000..323c280
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.Extend.cs
@@ -0,0 +1,26 @@
+using System.IO;
+using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
+{
+    public partial class excelDevelopment : ITemplateHandler
+    {
+        private readonly TemplateBuildModel _model;
+
+        public excelDevelopment(TemplateBuildModel model)
+        {
+            _model = model;
+        }
+
+        public void Save()
+        {
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
+            if (!Directory.Exists(dir))
+                Directory.CreateDirectory(dir);
+
+            var content = TransformText();
+            var filePath = Path.Combine(dir, "excel.Development.json");
+            File.WriteAllText(filePath, content);
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.cs
new file mode 100644
index 0000000..9937453
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.cs
@@ -0,0 +1,307 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     �˴����ɹ������ɡ�
+//     ����ʱ�汾: 16.0.0.0
+//  
+//     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
+//     �������ɴ��룬��Щ���Ľ��ᶪʧ��
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
+{
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\excelDevelopment.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public partial class excelDevelopment : excelDevelopmentBase
+    {
+#line hidden
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public virtual string TransformText()
+        {
+            this.Write("{\r\n}");
+            return this.GenerationEnvironment.ToString();
+        }
+    }
+    
+    #line default
+    #line hidden
+    #region Base class
+    /// <summary>
+    /// Base class for this transformation
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public class excelDevelopmentBase
+    {
+        #region Fields
+        private global::System.Text.StringBuilder generationEnvironmentField;
+        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
+        private global::System.Collections.Generic.List<int> indentLengthsField;
+        private string currentIndentField = "";
+        private bool endsWithNewline;
+        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
+        #endregion
+        #region Properties
+        /// <summary>
+        /// The string builder that generation-time code is using to assemble generated output
+        /// </summary>
+        protected System.Text.StringBuilder GenerationEnvironment
+        {
+            get
+            {
+                if ((this.generationEnvironmentField == null))
+                {
+                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
+                }
+                return this.generationEnvironmentField;
+            }
+            set
+            {
+                this.generationEnvironmentField = value;
+            }
+        }
+        /// <summary>
+        /// The error collection for the generation process
+        /// </summary>
+        public System.CodeDom.Compiler.CompilerErrorCollection Errors
+        {
+            get
+            {
+                if ((this.errorsField == null))
+                {
+                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
+                }
+                return this.errorsField;
+            }
+        }
+        /// <summary>
+        /// A list of the lengths of each indent that was added with PushIndent
+        /// </summary>
+        private System.Collections.Generic.List<int> indentLengths
+        {
+            get
+            {
+                if ((this.indentLengthsField == null))
+                {
+                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
+                }
+                return this.indentLengthsField;
+            }
+        }
+        /// <summary>
+        /// Gets the current indent we use when adding lines to the output
+        /// </summary>
+        public string CurrentIndent
+        {
+            get
+            {
+                return this.currentIndentField;
+            }
+        }
+        /// <summary>
+        /// Current transformation session
+        /// </summary>
+        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
+        {
+            get
+            {
+                return this.sessionField;
+            }
+            set
+            {
+                this.sessionField = value;
+            }
+        }
+        #endregion
+        #region Transform-time helpers
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void Write(string textToAppend)
+        {
+            if (string.IsNullOrEmpty(textToAppend))
+            {
+                return;
+            }
+            // If we're starting off, or if the previous text ended with a newline,
+            // we have to append the current indent first.
+            if (((this.GenerationEnvironment.Length == 0) 
+                        || this.endsWithNewline))
+            {
+                this.GenerationEnvironment.Append(this.currentIndentField);
+                this.endsWithNewline = false;
+            }
+            // Check if the current text ends with a newline
+            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
+            {
+                this.endsWithNewline = true;
+            }
+            // This is an optimization. If the current indent is "", then we don't have to do any
+            // of the more complex stuff further down.
+            if ((this.currentIndentField.Length == 0))
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+                return;
+            }
+            // Everywhere there is a newline in the text, add an indent after it
+            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
+            // If the text ends with a newline, then we should strip off the indent added at the very end
+            // because the appropriate indent will be added when the next time Write() is called
+            if (this.endsWithNewline)
+            {
+                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
+            }
+            else
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+            }
+        }
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void WriteLine(string textToAppend)
+        {
+            this.Write(textToAppend);
+            this.GenerationEnvironment.AppendLine();
+            this.endsWithNewline = true;
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void Write(string format, params object[] args)
+        {
+            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void WriteLine(string format, params object[] args)
+        {
+            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Raise an error
+        /// </summary>
+        public void Error(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Raise a warning
+        /// </summary>
+        public void Warning(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            error.IsWarning = true;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Increase the indent
+        /// </summary>
+        public void PushIndent(string indent)
+        {
+            if ((indent == null))
+            {
+                throw new global::System.ArgumentNullException("indent");
+            }
+            this.currentIndentField = (this.currentIndentField + indent);
+            this.indentLengths.Add(indent.Length);
+        }
+        /// <summary>
+        /// Remove the last indent that was added with PushIndent
+        /// </summary>
+        public string PopIndent()
+        {
+            string returnValue = "";
+            if ((this.indentLengths.Count > 0))
+            {
+                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
+                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
+                if ((indentLength > 0))
+                {
+                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
+                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
+                }
+            }
+            return returnValue;
+        }
+        /// <summary>
+        /// Remove any indentation
+        /// </summary>
+        public void ClearIndent()
+        {
+            this.indentLengths.Clear();
+            this.currentIndentField = "";
+        }
+        #endregion
+        #region ToString Helpers
+        /// <summary>
+        /// Utility class to produce culture-oriented representation of an object as a string.
+        /// </summary>
+        public class ToStringInstanceHelper
+        {
+            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
+            /// <summary>
+            /// Gets or sets format provider to be used by ToStringWithCulture method.
+            /// </summary>
+            public System.IFormatProvider FormatProvider
+            {
+                get
+                {
+                    return this.formatProviderField ;
+                }
+                set
+                {
+                    if ((value != null))
+                    {
+                        this.formatProviderField  = value;
+                    }
+                }
+            }
+            /// <summary>
+            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
+            /// </summary>
+            public string ToStringWithCulture(object objectToConvert)
+            {
+                if ((objectToConvert == null))
+                {
+                    throw new global::System.ArgumentNullException("objectToConvert");
+                }
+                System.Type t = objectToConvert.GetType();
+                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
+                            typeof(System.IFormatProvider)});
+                if ((method == null))
+                {
+                    return objectToConvert.ToString();
+                }
+                else
+                {
+                    return ((string)(method.Invoke(objectToConvert, new object[] {
+                                this.formatProviderField })));
+                }
+            }
+        }
+        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
+        /// <summary>
+        /// Helper to produce culture-oriented representation of an object as a string
+        /// </summary>
+        public ToStringInstanceHelper ToStringHelper
+        {
+            get
+            {
+                return this.toStringHelperField;
+            }
+        }
+        #endregion
+    }
+    #endregion
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.tt
new file mode 100644
index 0000000..7a73a41
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.tt
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
index 3afa00e..1136531 100644
--- a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
+++ b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.7"}
+{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.8"}
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index 7247959..6a88dd2 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -39,4 +39,4 @@
     "sass-loader": "^8.0.0",
     "vue-template-compiler": "^2.6.11"
   }
-}
\ No newline at end of file
+}
diff --git a/src/WebHost/Properties/launchSettings.json b/src/WebHost/Properties/launchSettings.json
index a8a37d7..6c7a1f8 100644
--- a/src/WebHost/Properties/launchSettings.json
+++ b/src/WebHost/Properties/launchSettings.json
@@ -1,27 +1,12 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:2942/",
-      "sslPort": 0
-    }
-  },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "WebHost": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://localhost:2943/"
+      "applicationUrl": "http://localhost:6222/swagger"
     }
   }
 }
\ No newline at end of file

From 24b32594c735f5a819905472693f0e9176f202e3 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Tue, 14 Jan 2020 16:02:04 +0800
Subject: [PATCH 17/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/MySql/nm_admin.sql                       | 651 ------------------
 data/MySql/nm_codegenerator.sql               | 154 -----
 data/SQLite/Nm_Admin.db                       | Bin 647168 -> 151552 bytes
 data/SqlServer/Nm_Admin.sql                   | Bin 252188 -> 0 bytes
 data/SqlServer/Nm_CodeGenerator.sql           | Bin 21520 -> 0 bytes
 src/Library/Application/Application.csproj    |   2 +-
 src/Library/Domain/Domain.csproj              |   6 +-
 .../Infrastructure/Infrastructure.csproj      |   2 +-
 src/UI/module-code-generator/package.json     |  22 +-
 .../src/views/enum/index/page.js              |   1 +
 src/Web/Web.csproj                            |   4 +-
 src/WebHost/WebHost.csproj                    |  10 +-
 src/WebHost/config/db.json                    |   2 +-
 13 files changed, 25 insertions(+), 829 deletions(-)
 delete mode 100644 data/MySql/nm_admin.sql
 delete mode 100644 data/MySql/nm_codegenerator.sql
 delete mode 100644 data/SqlServer/Nm_Admin.sql
 delete mode 100644 data/SqlServer/Nm_CodeGenerator.sql

diff --git a/data/MySql/nm_admin.sql b/data/MySql/nm_admin.sql
deleted file mode 100644
index dad2bb2..0000000
--- a/data/MySql/nm_admin.sql
+++ /dev/null
@@ -1,651 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : nm-codegenerator-mysql
- Source Server Type    : MySQL
- Source Server Version : 80018
- Source Host           : localhost:27222
- Source Schema         : nm_admin
-
- Target Server Type    : MySQL
- Target Server Version : 80018
- File Encoding         : 65001
-
- Date: 05/12/2019 16:44:17
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for account
--- ----------------------------
-DROP TABLE IF EXISTS `account`;
-CREATE TABLE `account`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Type` smallint(3) NOT NULL DEFAULT 0,
-  `UserName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Password` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Name` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Phone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Email` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `LoginTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `LoginIP` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Status` smallint(3) NOT NULL DEFAULT 0,
-  `IsLock` bit(1) NOT NULL DEFAULT b'0',
-  `ClosedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ClosedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `CreatedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `CreatedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Deleted` bit(1) NOT NULL DEFAULT b'0',
-  `DeletedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `DeletedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of account
--- ----------------------------
-INSERT INTO `account` VALUES ('2E23D1D9-4A72-ACC2-F6FF-39ED21CB6A4A', 0, 'admin', 'E739279CB28CDAFD7373618313803524', '管理员', '', '', '2019-12-05 16:43:04', '0.0.0.1', 1, b'0', '2019-10-09 00:00:00', '00000000-0000-0000-0000-000000000000', '2019-10-09 00:00:00', '00000000-0000-0000-0000-000000000000', '2019-10-09 00:00:00', '00000000-0000-0000-0000-000000000000', b'0', '2019-10-09 00:00:00', '00000000-0000-0000-0000-000000000000');
-
--- ----------------------------
--- Table structure for account_config
--- ----------------------------
-DROP TABLE IF EXISTS `account_config`;
-CREATE TABLE `account_config`  (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `AccountId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Skin` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Theme` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `FontSize` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of account_config
--- ----------------------------
-INSERT INTO `account_config` VALUES (1, '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', 'pretty', 'default', 'medium');
-
--- ----------------------------
--- Table structure for account_role
--- ----------------------------
-DROP TABLE IF EXISTS `account_role`;
-CREATE TABLE `account_role`  (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `AccountId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `RoleId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of account_role
--- ----------------------------
-INSERT INTO `account_role` VALUES (2, '2E23D1D9-4A72-ACC2-F6FF-39ED21CB6A4A', '39f08d5b-173b-1cbb-7381-407c87b2e8e2');
-
--- ----------------------------
--- Table structure for auditinfo
--- ----------------------------
-DROP TABLE IF EXISTS `auditinfo`;
-CREATE TABLE `auditinfo`  (
-  `Id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `AccountId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `AccountName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `Area` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `Module` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `Controller` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ControllerDesc` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `Action` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ActionDesc` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `Parameters` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `Result` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `ExecutionTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ExecutionDuration` bigint(20) NOT NULL DEFAULT 0,
-  `BrowserInfo` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Platform` smallint(3) NOT NULL DEFAULT 0,
-  `IP` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for button
--- ----------------------------
-DROP TABLE IF EXISTS `button`;
-CREATE TABLE `button`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `MenuCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Icon` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `Code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `CreatedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `CreatedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of button
--- ----------------------------
-INSERT INTO `button` VALUES ('39f08dae-46e6-f6f2-cbff-fe925a9d9946', 'personnelfiles_company', '添加', 'add', 'personnelfiles_company_add', '2019-09-29 13:32:23', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:23', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-46fc-9606-cae1-2c04803de11f', 'personnelfiles_company', '编辑', 'edit', 'personnelfiles_company_edit', '2019-09-29 13:32:23', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:23', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-4709-666f-39e8-11cfb7db4594', 'personnelfiles_company', '删除', 'delete', 'personnelfiles_company_del', '2019-09-29 13:32:23', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:23', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-5305-3dc4-ebe6-771d999a8e44', 'personnelfiles_department', '添加', 'add', 'personnelfiles_department_add', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-5315-b2cb-bd0a-65aaec059274', 'personnelfiles_department', '编辑', 'edit', 'personnelfiles_department_edit', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-5323-c008-deeb-865f8b94be29', 'personnelfiles_department', '删除', 'delete', 'personnelfiles_department_del', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-5327-e25c-ff40-0523a20e5d8c', 'personnelfiles_department', '岗位', 'edit', 'personnelfiles_department_position', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-533a-604e-b0f7-a987eeb2f0de', 'personnelfiles_department', '岗位添加', 'add', 'personnelfiles_department_position_add', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-534a-fcdd-27dc-2f5b0f8eb80c', 'personnelfiles_department', '岗位编辑', 'edit', 'personnelfiles_department_position_edit', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-5358-b231-a8c5-0116ba761066', 'personnelfiles_department', '岗位删除', 'delete', 'personnelfiles_department_position_del', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:26', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-5e49-6a91-4661-55c6f645cc45', 'personnelfiles_position', '删除', 'delete', 'personnelfiles_position_del', '2019-09-29 13:32:29', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:29', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-886e-6a3e-9a33-4f95f1bed0ae', 'personnelfiles_user', '添加', 'add', 'personnelfiles_user_add', '2019-09-29 13:32:40', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:40', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-887d-fda0-3bf1-e76c7c490364', 'personnelfiles_user', '编辑', 'edit', 'personnelfiles_user_edit', '2019-09-29 13:32:40', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:40', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-8886-697c-73d1-0ab76ecaf2b9', 'personnelfiles_user', '删除', 'delete', 'personnelfiles_user_del', '2019-09-29 13:32:40', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:40', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-8895-ce81-c6ec-723849dbc839', 'personnelfiles_user', '工作经历', 'work', 'personnelfiles_user_work_history', '2019-09-29 13:32:40', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:40', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-88a0-823c-9da9-9fbe6d546612', 'personnelfiles_user', '教育经历', 'education', 'personnelfiles_user_education_history', '2019-09-29 13:32:40', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:40', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-d230-1374-d024-1123543b6a9d', 'common_area', '添加', 'add', 'common_area_add', '2019-09-29 13:32:59', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:59', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-d23c-c202-2cc8-d4ac00483563', 'common_area', '编辑', 'edit', 'common_area_edit', '2019-09-29 13:32:59', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:59', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-d240-6179-e176-bd044f544712', 'common_area', '删除', 'delete', 'common_area_del', '2019-09-29 13:32:59', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:32:59', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-e147-307d-4b87-1742fa9e5885', 'common_attachment', '删除', 'delete', 'common_attachment_del', '2019-09-29 13:33:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:03', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08dae-e157-e486-3d68-06e5152d5e50', 'common_attachment', '导出', 'export', 'common_attachment_export', '2019-09-29 13:33:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:03', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-10f0-4af0-c82e-525f06a2f2c5', 'quartz_group', '添加', 'add', 'quartz_group_add', '2019-09-29 13:33:15', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-09 15:15:37', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `button` VALUES ('39f08daf-10f7-7c83-9eec-048c3b1c9884', 'quartz_group', '删除', 'delete', 'quartz_group_del', '2019-09-29 13:33:15', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-09 15:15:37', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `button` VALUES ('39f08daf-4498-7ee7-797c-a2ab7871b505', 'quartz_job', '添加', 'add', 'quartz_job_add', '2019-09-29 13:33:28', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:28', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-44a9-d1bc-755d-c3369034e10a', 'quartz_job', '编辑', 'edit', 'quartz_job_edit', '2019-09-29 13:33:28', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:28', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-44ad-ac06-083a-c5a44b8e99dc', 'quartz_job', '暂停', 'pause', 'quartz_job_pause', '2019-09-29 13:33:28', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:28', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-44ba-da99-4a81-8dcc78efcf82', 'quartz_job', '启动', 'run', 'quartz_job_resume', '2019-09-29 13:33:28', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:28', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-44c9-7fe4-defd-0939a64171cd', 'quartz_job', '日志', 'log', 'quartz_job_log', '2019-09-29 13:33:28', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:28', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-44cd-0154-5dcd-f428972e22f2', 'quartz_job', '删除', 'delete', 'quartz_job_del', '2019-09-29 13:33:28', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:28', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-7366-40d9-6116-510f50a9949b', 'admin_moduleinfo', '同步', 'refresh', 'admin_moduleinfo_sync', '2019-09-29 13:33:40', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:40', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-7379-0830-a724-272048d335c4', 'admin_moduleinfo', '删除', 'delete', 'admin_moduleinfo_del', '2019-09-29 13:33:40', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:40', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-8092-82f1-bf83-c74b15f5fae3', 'admin_permission', '同步', 'refresh', 'admin_permission_sync', '2019-09-29 13:33:43', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:43', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-8ff9-b2e7-f6ec-bbc690f7568a', 'admin_menu', '添加', 'add', 'admin_menu_add', '2019-09-29 13:33:47', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:47', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-8ffe-d189-3f53-f2174cb2e3d4', 'admin_menu', '编辑', 'edit', 'admin_menu_edit', '2019-09-29 13:33:47', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:47', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-901a-ea1c-6dbc-fd3d68fb9757', 'admin_menu', '删除', 'delete', 'admin_menu_del', '2019-09-29 13:33:47', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:47', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-9020-8ebb-2d86-bd0adcd9d9dd', 'admin_menu', '排序', 'sort', 'admin_menu_sort', '2019-09-29 13:33:47', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:47', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-9b13-0809-b6f5-64d2430a37c4', 'admin_role', '添加', 'add', 'admin_role_add', '2019-09-29 13:33:50', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:50', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-9b1f-b315-ccc8-4ed480ae2595', 'admin_role', '编辑', 'edit', 'admin_role_edit', '2019-09-29 13:33:50', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:50', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-9b28-8f39-eeb7-289ea4c44604', 'admin_role', '删除', 'delete', 'admin_role_del', '2019-09-29 13:33:50', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:50', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-9b38-d4f7-270d-5e8629f9601d', 'admin_role', '绑定菜单', 'bind', 'admin_role_bind_menu', '2019-09-29 13:33:50', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:50', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-a6a3-772f-7559-4a22f0614589', 'admin_account', '添加', 'add', 'admin_account_add', '2019-09-29 13:33:53', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:53', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-a6b0-0ea0-58c4-918941c668b2', 'admin_account', '编辑', 'edit', 'admin_account_edit', '2019-09-29 13:33:53', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:53', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-a6b9-a4ac-5953-a4e4074ef3b0', 'admin_account', '删除', 'delete', 'admin_account_del', '2019-09-29 13:33:53', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:53', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-a6cc-8c2f-e31a-9c91f6c6afce', 'admin_account', '重置密码', 'refresh', 'admin_account_reset_password', '2019-09-29 13:33:53', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:53', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-b45e-0264-f197-063f969d3aa0', 'admin_auditinfo', '详情', 'detail', 'admin_auditinfo_details', '2019-09-29 13:33:57', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:57', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `button` VALUES ('39f08daf-f905-e02f-341a-bbc0b80cbf5e', 'admin_config', '添加', 'add', 'admin_config_add', '2019-09-29 13:34:14', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-09 15:15:07', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `button` VALUES ('39f08daf-f909-628c-9a0a-2c23a57b9103', 'admin_config', '编辑', 'edit', 'admin_config_edit', '2019-09-29 13:34:14', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-09 15:15:07', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `button` VALUES ('39f08daf-f915-e1f1-d7d8-ebd21adbebe6', 'admin_config', '删除', 'delete', 'admin_config_del', '2019-09-29 13:34:14', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-09 15:15:07', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `button` VALUES ('39f08db3-ea6b-6af7-1ef5-a226af30fbe4', 'codegenerator_project', '添加', 'add', 'codegenerator_project_add', '2019-09-29 13:38:33', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:32:03', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `button` VALUES ('39f08db3-ea80-e0e3-69ea-af5ab431ac6f', 'codegenerator_project', '编辑', 'edit', 'codegenerator_project_edit', '2019-09-29 13:38:33', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:32:03', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `button` VALUES ('39f08db3-eaa7-e42f-34fb-25baaaf55e87', 'codegenerator_project', '删除', 'delete', 'codegenerator_project_del', '2019-09-29 13:38:33', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:32:03', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `button` VALUES ('39f08db3-eada-892b-b250-c2d58279d388', 'codegenerator_project', '生成', 'download', 'codegenerator_project_build_code', '2019-09-29 13:38:33', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:32:03', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `button` VALUES ('39f08db3-f788-9a1c-f227-f372acb73cea', 'codegenerator_enum', '添加', 'add', 'codegenerator_enum_add', '2019-09-29 13:38:36', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:32:05', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `button` VALUES ('39f08db3-f7ba-4c00-d053-ca662ef2ad06', 'codegenerator_enum', '编辑', 'edit', 'codegenerator_enum_edit', '2019-09-29 13:38:36', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:32:05', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `button` VALUES ('39f08db3-f7d6-7533-682f-739e51d10ae1', 'codegenerator_enum', '删除', 'delete', 'codegenerator_enum_del', '2019-09-29 13:38:36', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:32:05', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-
--- ----------------------------
--- Table structure for button_permission
--- ----------------------------
-DROP TABLE IF EXISTS `button_permission`;
-CREATE TABLE `button_permission`  (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `ButtonCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `PermissionCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 100 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of button_permission
--- ----------------------------
-INSERT INTO `button_permission` VALUES (1, 'personnelfiles_company_add', 'personnelfiles_company_add_post');
-INSERT INTO `button_permission` VALUES (2, 'personnelfiles_company_edit', 'personnelfiles_company_edit_get');
-INSERT INTO `button_permission` VALUES (3, 'personnelfiles_company_edit', 'personnelfiles_company_update_post');
-INSERT INTO `button_permission` VALUES (4, 'personnelfiles_company_del', 'personnelfiles_company_delete_delete');
-INSERT INTO `button_permission` VALUES (5, 'personnelfiles_department_add', 'personnelfiles_department_add_post');
-INSERT INTO `button_permission` VALUES (6, 'personnelfiles_department_edit', 'personnelfiles_department_edit_get');
-INSERT INTO `button_permission` VALUES (7, 'personnelfiles_department_edit', 'personnelfiles_department_update_post');
-INSERT INTO `button_permission` VALUES (8, 'personnelfiles_department_del', 'personnelfiles_department_delete_delete');
-INSERT INTO `button_permission` VALUES (9, 'personnelfiles_department_position', 'personnelfiles_position_query_get');
-INSERT INTO `button_permission` VALUES (10, 'personnelfiles_department_position_add', 'personnelfiles_position_add_post');
-INSERT INTO `button_permission` VALUES (11, 'personnelfiles_department_position_edit', 'personnelfiles_position_edit_get');
-INSERT INTO `button_permission` VALUES (12, 'personnelfiles_department_position_edit', 'personnelfiles_position_update_post');
-INSERT INTO `button_permission` VALUES (13, 'personnelfiles_department_position_del', 'personnelfiles_position_delete_delete');
-INSERT INTO `button_permission` VALUES (14, 'personnelfiles_position_del', 'personnelfiles_position_delete_delete');
-INSERT INTO `button_permission` VALUES (15, 'personnelfiles_user_add', 'personnelfiles_user_add_post');
-INSERT INTO `button_permission` VALUES (16, 'personnelfiles_user_add', 'personnelfiles_user_uploadpicture_post');
-INSERT INTO `button_permission` VALUES (17, 'personnelfiles_user_edit', 'personnelfiles_user_edit_get');
-INSERT INTO `button_permission` VALUES (18, 'personnelfiles_user_edit', 'personnelfiles_user_update_post');
-INSERT INTO `button_permission` VALUES (19, 'personnelfiles_user_edit', 'personnelfiles_user_uploadpicture_post');
-INSERT INTO `button_permission` VALUES (20, 'personnelfiles_user_edit', 'personnelfiles_user_editcontact_get');
-INSERT INTO `button_permission` VALUES (21, 'personnelfiles_user_edit', 'personnelfiles_user_updatecontact_post');
-INSERT INTO `button_permission` VALUES (22, 'personnelfiles_user_edit', 'personnelfiles_user_contactdetails_get');
-INSERT INTO `button_permission` VALUES (23, 'personnelfiles_user_del', 'personnelfiles_user_delete_delete');
-INSERT INTO `button_permission` VALUES (24, 'personnelfiles_user_work_history', 'personnelfiles_userworkhistory_query_get');
-INSERT INTO `button_permission` VALUES (25, 'personnelfiles_user_work_history', 'personnelfiles_userworkhistory_add_post');
-INSERT INTO `button_permission` VALUES (26, 'personnelfiles_user_work_history', 'personnelfiles_userworkhistory_edit_get');
-INSERT INTO `button_permission` VALUES (27, 'personnelfiles_user_work_history', 'personnelfiles_userworkhistory_update_get');
-INSERT INTO `button_permission` VALUES (28, 'personnelfiles_user_work_history', 'personnelfiles_userworkhistory_delete_delete');
-INSERT INTO `button_permission` VALUES (29, 'personnelfiles_user_education_history', 'personnelfiles_usereducationhistory_query_get');
-INSERT INTO `button_permission` VALUES (30, 'personnelfiles_user_education_history', 'personnelfiles_usereducationhistory_add_post');
-INSERT INTO `button_permission` VALUES (31, 'personnelfiles_user_education_history', 'personnelfiles_usereducationhistory_edit_get');
-INSERT INTO `button_permission` VALUES (32, 'personnelfiles_user_education_history', 'personnelfiles_usereducationhistory_update_get');
-INSERT INTO `button_permission` VALUES (33, 'personnelfiles_user_education_history', 'personnelfiles_usereducationhistory_delete_delete');
-INSERT INTO `button_permission` VALUES (34, 'common_area_add', 'common_area_add_post');
-INSERT INTO `button_permission` VALUES (35, 'common_area_edit', 'common_area_edit_get');
-INSERT INTO `button_permission` VALUES (36, 'common_area_edit', 'common_area_update_post');
-INSERT INTO `button_permission` VALUES (37, 'common_area_del', 'common_area_delete_delete');
-INSERT INTO `button_permission` VALUES (38, 'common_attachment_del', 'common_attachment_delete_delete');
-INSERT INTO `button_permission` VALUES (39, 'common_attachment_export', 'common_attachment_export_get');
-INSERT INTO `button_permission` VALUES (42, 'quartz_job_add', 'quartz_job_add_post');
-INSERT INTO `button_permission` VALUES (43, 'quartz_job_edit', 'quartz_job_edit_get');
-INSERT INTO `button_permission` VALUES (44, 'quartz_job_edit', 'quartz_job_update_post');
-INSERT INTO `button_permission` VALUES (45, 'quartz_job_pause', 'quartz_job_pause_post');
-INSERT INTO `button_permission` VALUES (46, 'quartz_job_resume', 'quartz_job_resume_post');
-INSERT INTO `button_permission` VALUES (47, 'quartz_job_log', 'quartz_job_log_get');
-INSERT INTO `button_permission` VALUES (48, 'quartz_job_del', 'quartz_job_delete_delete');
-INSERT INTO `button_permission` VALUES (49, 'admin_moduleinfo_sync', 'admin_moduleinfo_sync_post');
-INSERT INTO `button_permission` VALUES (50, 'admin_moduleinfo_del', 'admin_moduleinfo_delete_delete');
-INSERT INTO `button_permission` VALUES (51, 'admin_permission_sync', 'admin_permission_sync_post');
-INSERT INTO `button_permission` VALUES (52, 'admin_menu_add', 'admin_menu_add_post');
-INSERT INTO `button_permission` VALUES (53, 'admin_menu_edit', 'admin_menu_edit_get');
-INSERT INTO `button_permission` VALUES (54, 'admin_menu_edit', 'admin_menu_update_post');
-INSERT INTO `button_permission` VALUES (55, 'admin_menu_del', 'admin_menu_delete_delete');
-INSERT INTO `button_permission` VALUES (56, 'admin_menu_sort', 'admin_menu_sort_get');
-INSERT INTO `button_permission` VALUES (57, 'admin_menu_sort', 'admin_menu_sort_post');
-INSERT INTO `button_permission` VALUES (58, 'admin_role_add', 'admin_role_add_post');
-INSERT INTO `button_permission` VALUES (59, 'admin_role_edit', 'admin_role_edit_get');
-INSERT INTO `button_permission` VALUES (60, 'admin_role_edit', 'admin_role_update_post');
-INSERT INTO `button_permission` VALUES (61, 'admin_role_del', 'admin_role_delete_delete');
-INSERT INTO `button_permission` VALUES (62, 'admin_role_bind_menu', 'admin_role_menulist_get');
-INSERT INTO `button_permission` VALUES (63, 'admin_role_bind_menu', 'admin_role_bindmenu_post');
-INSERT INTO `button_permission` VALUES (64, 'admin_role_bind_menu', 'admin_role_menubuttonlist_get');
-INSERT INTO `button_permission` VALUES (65, 'admin_role_bind_menu', 'admin_role_bindmenubutton_post');
-INSERT INTO `button_permission` VALUES (66, 'admin_account_add', 'admin_account_add_post');
-INSERT INTO `button_permission` VALUES (67, 'admin_account_edit', 'admin_account_edit_get');
-INSERT INTO `button_permission` VALUES (68, 'admin_account_edit', 'admin_account_update_post');
-INSERT INTO `button_permission` VALUES (69, 'admin_account_del', 'admin_account_delete_delete');
-INSERT INTO `button_permission` VALUES (70, 'admin_account_reset_password', 'admin_account_updatepassword_post');
-INSERT INTO `button_permission` VALUES (71, 'admin_auditinfo_details', 'admin_auditinfo_details_get');
-INSERT INTO `button_permission` VALUES (85, 'admin_config_add', 'admin_config_add_post');
-INSERT INTO `button_permission` VALUES (86, 'admin_config_edit', 'admin_config_edit_get');
-INSERT INTO `button_permission` VALUES (87, 'admin_config_edit', 'admin_config_update_post');
-INSERT INTO `button_permission` VALUES (88, 'admin_config_del', 'admin_config_delete_delete');
-INSERT INTO `button_permission` VALUES (89, 'quartz_group_add', 'quartz_group_add_post');
-INSERT INTO `button_permission` VALUES (90, 'quartz_group_del', 'quartz_group_delete_delete');
-INSERT INTO `button_permission` VALUES (91, 'codegenerator_project_add', 'codegenerator_project_add_post');
-INSERT INTO `button_permission` VALUES (92, 'codegenerator_project_edit', 'codegenerator_project_edit_get');
-INSERT INTO `button_permission` VALUES (93, 'codegenerator_project_edit', 'codegenerator_project_update_post');
-INSERT INTO `button_permission` VALUES (94, 'codegenerator_project_del', 'codegenerator_project_delete_delete');
-INSERT INTO `button_permission` VALUES (95, 'codegenerator_project_build_code', 'codegenerator_project_buildcode_post');
-INSERT INTO `button_permission` VALUES (96, 'codegenerator_enum_add', 'codegenerator_enum_add_post');
-INSERT INTO `button_permission` VALUES (97, 'codegenerator_enum_edit', 'codegenerator_enum_edit_get');
-INSERT INTO `button_permission` VALUES (98, 'codegenerator_enum_edit', 'codegenerator_enum_update_post');
-INSERT INTO `button_permission` VALUES (99, 'codegenerator_enum_del', 'codegenerator_enum_delete_delete');
-
--- ----------------------------
--- Table structure for config
--- ----------------------------
-DROP TABLE IF EXISTS `config`;
-CREATE TABLE `config`  (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `Key` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Value` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Remarks` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `CreatedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `CreatedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 23 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of config
--- ----------------------------
-INSERT INTO `config` VALUES (1, 'sys_title', '通用权限管理系统', '系统标题', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:29', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (2, 'sys_logo', '', '系统Logo', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:29', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (3, 'sys_home', '/admin/home', '系统首页地址', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:29', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (4, 'sys_userinfo_page', '', '个人信息页', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:29', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (5, 'sys_button_permission', 'True', '启用按钮权限', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `config` VALUES (6, 'sys_permission_validate', 'True', '开启权限验证', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (7, 'sys_auditing', 'True', '启用审计日志', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `config` VALUES (8, 'sys_verify_code', 'False', '启用登录验证码功能', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `config` VALUES (9, 'sys_toolbar_fullscreen', 'True', '全屏按钮', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:39', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (10, 'sys_toolbar_skin', 'True', '皮肤设置按钮', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:39', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (11, 'sys_toolbar_logout', 'True', '退出按钮', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:39', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (12, 'sys_toolbar_userinfo', 'True', '用户信息按钮', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:39', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (13, 'sys_toolbar_customcss', '', '自定义CSS样式', '2019-09-29 12:02:03', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:40:32', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `config` VALUES (14, 'sys_copyright', '版权所有：尼古拉斯·老李 | 用代码改变世界 Powered byET Core 3.0.0 on Linux', '版权声明', '2019-12-05 16:43:29', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:29', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (15, 'sys_permission_button', 'True', '启用按钮权限', '2019-12-05 16:43:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (16, 'sys_permission_auditing', 'True', '审计日志', '2019-12-05 16:43:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (17, 'sys_login_type', 'neon', '登录页类型', '2019-12-05 16:43:37', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:37', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (18, 'sys_login_verify_code', 'False', '启用验证码功能', '2019-12-05 16:43:37', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:37', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (19, 'sys_component_menu_unique_opened', 'True', '菜单只能打开一个', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (20, 'sys_component_dialog_close_on_click_modal', 'False', '是否可以点击模态框关闭', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (21, 'sys_component_list_serial_number_name', '', '序号名称', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `config` VALUES (22, 'sys_component_custom_css', '', '自定义Css样式', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:43', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-
--- ----------------------------
--- Table structure for menu
--- ----------------------------
-DROP TABLE IF EXISTS `menu`;
-CREATE TABLE `menu`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModuleCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Type` smallint(3) NOT NULL DEFAULT 0,
-  `ParentId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `RouteName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `RouteParams` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `RouteQuery` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Url` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Icon` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `IconColor` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `Level` int(11) NOT NULL DEFAULT 0,
-  `Show` bit(1) NOT NULL DEFAULT b'0',
-  `Sort` int(11) NOT NULL DEFAULT 0,
-  `Target` smallint(3) NOT NULL DEFAULT 0,
-  `DialogWidth` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `DialogHeight` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `DialogFullscreen` bit(1) NOT NULL DEFAULT b'0',
-  `Remarks` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `CreatedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `CreatedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of menu
--- ----------------------------
-INSERT INTO `menu` VALUES ('39f08dac-84e1-54e2-22ee-e5d7e3606f90', '', 0, '00000000-0000-0000-0000-000000000000', '系统设置', '', '', '', '', 'system', '', 0, b'1', 2, -1, '', '', b'1', '', '2019-09-29 13:30:28', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:32:25', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `menu` VALUES ('39f08dac-9b84-9a56-20b9-26789223a74f', '', 0, '00000000-0000-0000-0000-000000000000', '权限管理', '', '', '', '', 'permission', '', 0, b'1', 1, -1, '', '', b'1', '', '2019-09-29 13:30:34', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:32:25', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `menu` VALUES ('39f08dad-aca0-7ddf-61d1-0b6ac0841b64', '', 2, '00000000-0000-0000-0000-000000000000', 'GitHub', '', '', '', 'https://github.com/iamoldli/NetModular', 'github', '', 0, b'1', 4, 0, '', '', b'1', '', '2019-09-29 13:31:44', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:32:25', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `menu` VALUES ('39f08daf-7355-6fb9-cfe6-b9804de226f9', 'Admin', 1, '39f08dac-9b84-9a56-20b9-26789223a74f', '模块管理', 'admin_moduleinfo', '', '', '', 'product', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:33:40', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:40', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `menu` VALUES ('39f08daf-8081-2b67-5f77-3c4119b2ab66', 'Admin', 1, '39f08dac-9b84-9a56-20b9-26789223a74f', '权限列表', 'admin_permission', '', '', '', 'verifycode', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:33:43', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:43', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `menu` VALUES ('39f08daf-8feb-d2ce-66dc-12fff451a969', 'Admin', 1, '39f08dac-9b84-9a56-20b9-26789223a74f', '菜单管理', 'admin_menu', '', '', '', 'menu', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:33:47', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:47', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `menu` VALUES ('39f08daf-9b05-80d5-a7f5-21e450af9b70', 'Admin', 1, '39f08dac-9b84-9a56-20b9-26789223a74f', '角色管理', 'admin_role', '', '', '', 'role', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:33:50', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:50', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `menu` VALUES ('39f08daf-a689-5e91-dce9-e6d0088d29dc', 'Admin', 1, '39f08dac-9b84-9a56-20b9-26789223a74f', '账户管理', 'admin_account', '', '', '', 'user', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:33:53', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:53', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `menu` VALUES ('39f08daf-b44b-8fbf-3a88-629dc0922e84', 'Admin', 1, '39f08dac-9b84-9a56-20b9-26789223a74f', '审计日志', 'admin_auditinfo', '', '', '', 'log', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:33:57', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-09-29 13:33:57', '39f08d5b-177c-a334-34e7-408ef121c6e0');
-INSERT INTO `menu` VALUES ('39f08daf-e02b-bd7b-be06-12eeee0f4da4', 'Admin', 1, '39f08dac-84e1-54e2-22ee-e5d7e3606f90', '系统配置', 'admin_system', '', '', '', 'system', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:34:08', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:22', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `menu` VALUES ('39f08daf-f8f6-2dad-42c0-c73c787c6def', 'Admin', 1, '39f08dac-84e1-54e2-22ee-e5d7e3606f90', '配置项', 'admin_config', '', '', '', 'tag', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:34:14', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-09 15:15:07', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `menu` VALUES ('39f08db0-067d-fc37-84cb-b5283891fcce', 'Admin', 1, '39f08dac-84e1-54e2-22ee-e5d7e3606f90', '图标管理', 'admin_icon', '', '', '', 'photo', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-09-29 13:34:18', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-09 15:15:24', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `menu` VALUES ('39f10ddc-b762-96c9-58a3-9ce21ae7ebcd', '', 2, '00000000-0000-0000-0000-000000000000', '官方文档', '', '', '', 'https://nm.iamoldli.com/docs', 'archives', '', 0, b'1', 3, 0, '', '', b'1', '', '2019-10-24 10:54:30', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:32:25', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `menu` VALUES ('39f10e6c-c0c3-011e-b172-5cf586d41c10', '', 0, '00000000-0000-0000-0000-000000000000', '代码生成', '', '', '', '', 'develop', '', 0, b'1', 0, -1, '', '', b'1', '', '2019-10-24 13:31:50', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:32:25', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `menu` VALUES ('39f10e6c-f280-2e8c-6eba-3ae5e3353366', 'CodeGenerator', 1, '39f10e6c-c0c3-011e-b172-5cf586d41c10', '项目列表', 'codegenerator_project', '', '', '', 'project', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-10-24 13:32:03', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:32:03', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `menu` VALUES ('39f10e6c-fce2-97c7-e3f7-0fe8be590899', 'CodeGenerator', 1, '39f10e6c-c0c3-011e-b172-5cf586d41c10', '枚举列表', 'codegenerator_enum', '', '', '', '', '', 1, b'1', 0, 0, '', '', b'1', '', '2019-10-24 13:32:05', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:32:05', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-
--- ----------------------------
--- Table structure for menu_permission
--- ----------------------------
-DROP TABLE IF EXISTS `menu_permission`;
-CREATE TABLE `menu_permission`  (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `MenuCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `PermissionCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 34 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of menu_permission
--- ----------------------------
-INSERT INTO `menu_permission` VALUES (1, 'personnelfiles_company', 'personnelfiles_company_query_get');
-INSERT INTO `menu_permission` VALUES (2, 'personnelfiles_department', 'personnelfiles_department_query_get');
-INSERT INTO `menu_permission` VALUES (3, 'personnelfiles_department', 'personnelfiles_department_tree_get');
-INSERT INTO `menu_permission` VALUES (4, 'personnelfiles_user', 'personnelfiles_user_query_get');
-INSERT INTO `menu_permission` VALUES (5, 'common_area', 'common_area_query_get');
-INSERT INTO `menu_permission` VALUES (6, 'common_area', 'common_area_querychildren_get');
-INSERT INTO `menu_permission` VALUES (7, 'common_attachment', 'common_attachment_query_get');
-INSERT INTO `menu_permission` VALUES (9, 'quartz_job', 'quartz_job_query_get');
-INSERT INTO `menu_permission` VALUES (10, 'admin_moduleinfo', 'admin_moduleinfo_query_get');
-INSERT INTO `menu_permission` VALUES (11, 'admin_permission', 'admin_permission_query_get');
-INSERT INTO `menu_permission` VALUES (12, 'admin_menu', 'admin_menu_query_get');
-INSERT INTO `menu_permission` VALUES (13, 'admin_menu', 'admin_menu_tree_get');
-INSERT INTO `menu_permission` VALUES (14, 'admin_role', 'admin_role_query_get');
-INSERT INTO `menu_permission` VALUES (15, 'admin_account', 'admin_account_query_get');
-INSERT INTO `menu_permission` VALUES (16, 'admin_auditinfo', 'admin_auditinfo_query_get');
-INSERT INTO `menu_permission` VALUES (24, 'admin_config', 'admin_config_query_get');
-INSERT INTO `menu_permission` VALUES (25, 'quartz_group', 'quartz_group_query_get');
-INSERT INTO `menu_permission` VALUES (26, 'codegenerator_project', 'codegenerator_project_query_get');
-INSERT INTO `menu_permission` VALUES (27, 'codegenerator_enum', 'codegenerator_enum_query_get');
-INSERT INTO `menu_permission` VALUES (28, 'admin_system', 'admin_system_updatebaseconfig_post');
-INSERT INTO `menu_permission` VALUES (29, 'admin_system', 'admin_system_updatecomponentconfig_post');
-INSERT INTO `menu_permission` VALUES (30, 'admin_system', 'admin_system_updateloginconfig_post');
-INSERT INTO `menu_permission` VALUES (31, 'admin_system', 'admin_system_updatepermissionconfig_post');
-INSERT INTO `menu_permission` VALUES (32, 'admin_system', 'admin_system_updatetoolbarconfig_post');
-INSERT INTO `menu_permission` VALUES (33, 'admin_system', 'admin_system_uploadlogo_post');
-
--- ----------------------------
--- Table structure for moduleinfo
--- ----------------------------
-DROP TABLE IF EXISTS `moduleinfo`;
-CREATE TABLE `moduleinfo`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Version` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Remarks` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `CreatedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `CreatedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of moduleinfo
--- ----------------------------
-INSERT INTO `moduleinfo` VALUES ('39f08d5b-ba44-6817-6d57-fd07e0c9a482', '权限管理', 'Admin', '1.4.0-beta1', '', '2019-09-29 12:02:13', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:27', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `moduleinfo` VALUES ('39f10e6b-8c7e-a8f1-d185-664af23edff3', '代码生成', 'CodeGenerator', '1.4.0', '', '2019-10-24 13:30:31', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-10-24 13:31:27', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-
--- ----------------------------
--- Table structure for permission
--- ----------------------------
-DROP TABLE IF EXISTS `permission`;
-CREATE TABLE `permission`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Name` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModuleCode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Controller` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Action` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `HttpMethod` smallint(3) NOT NULL DEFAULT 0,
-  `Code` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `CreatedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `CreatedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of permission
--- ----------------------------
-INSERT INTO `permission` VALUES ('39f08d5b-d104-dad2-d611-3586643f34b7', '账户管理_绑定角色', 'Admin', 'Account', 'BindRole', 2, 'admin_account_bindrole_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d110-8a6f-5d0c-1acc4cd6e713', '账户管理_查询', 'Admin', 'Account', 'Query', 0, 'admin_account_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d11d-e539-b8e1-58967d8fd541', '账户管理_添加', 'Admin', 'Account', 'Add', 2, 'admin_account_add_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d131-df4d-fb47-2698f84c7cf6', '账户管理_编辑', 'Admin', 'Account', 'Edit', 0, 'admin_account_edit_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d136-91f1-39c4-eec8eb28f490', '账户管理_更新', 'Admin', 'Account', 'Update', 2, 'admin_account_update_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d149-b5a9-3e89-d13f3cedb1c6', '账户管理_删除', 'Admin', 'Account', 'Delete', 3, 'admin_account_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d158-c047-51d7-509b0606fd96', '账户管理_重置密码', 'Admin', 'Account', 'ResetPassword', 2, 'admin_account_resetpassword_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d175-9882-0f7c-fb2bae67f6c8', '审计信息_查询', 'Admin', 'AuditInfo', 'Query', 0, 'admin_auditinfo_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1ae-0b50-d74d-23ea07538398', '审计信息_详情', 'Admin', 'AuditInfo', 'Details', 0, 'admin_auditinfo_details_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1cc-e9c7-bd4d-da331764b4a3', '按钮管理_查询', 'Admin', 'Button', 'Query', 0, 'admin_button_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1d6-55c8-3580-cda4932af779', '配置项管理_查询', 'Admin', 'Config', 'Query', 0, 'admin_config_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1e0-65f2-73d4-8424438c8567', '配置项管理_添加', 'Admin', 'Config', 'Add', 2, 'admin_config_add_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1e5-9e0e-0c29-ddf2a73482b8', '配置项管理_删除', 'Admin', 'Config', 'Delete', 3, 'admin_config_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1ec-13f3-a1f5-23a2bc892d15', '配置项管理_编辑', 'Admin', 'Config', 'Edit', 0, 'admin_config_edit_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d1f1-f48b-9ebe-766fcb346c63', '配置项管理_修改', 'Admin', 'Config', 'Update', 2, 'admin_config_update_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d200-dee4-a526-d3422506a692', '菜单管理_菜单树', 'Admin', 'Menu', 'Tree', 0, 'admin_menu_tree_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d210-2150-33bc-f8b9b97d2b10', '菜单管理_查询菜单列表', 'Admin', 'Menu', 'Query', 0, 'admin_menu_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d21c-40fb-6de2-3bddb3a1682a', '菜单管理_添加', 'Admin', 'Menu', 'Add', 2, 'admin_menu_add_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d225-a13c-7b44-e8c3e7d3d128', '菜单管理_删除', 'Admin', 'Menu', 'Delete', 3, 'admin_menu_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d22e-ee56-933a-ed09cfb4a706', '菜单管理_编辑', 'Admin', 'Menu', 'Edit', 0, 'admin_menu_edit_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d236-7004-f0ca-925788da03aa', '菜单管理_更新', 'Admin', 'Menu', 'Update', 2, 'admin_menu_update_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d243-8f1a-7c50-6feeb098432e', '菜单管理_更新排序信息', 'Admin', 'Menu', 'Sort', 0, 'admin_menu_sort_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d24b-cfa0-96e6-9242c9cdff31', '菜单管理_更新排序信息', 'Admin', 'Menu', 'Sort', 2, 'admin_menu_sort_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d259-2ac7-dfa6-1bf0ae78e4f0', '模块信息_查询', 'Admin', 'ModuleInfo', 'Query', 0, 'admin_moduleinfo_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d264-13cc-1cc2-a4c2639e7fda', '模块信息_同步模块数据', 'Admin', 'ModuleInfo', 'Sync', 2, 'admin_moduleinfo_sync_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d269-43b8-2d42-48a8cf8a3c38', '模块信息_删除', 'Admin', 'ModuleInfo', 'Delete', 3, 'admin_moduleinfo_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d27d-241c-b966-5a4ce019fe3e', '权限接口_查询', 'Admin', 'Permission', 'Query', 0, 'admin_permission_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d286-6b4b-82cf-b8f4c8052fef', '权限接口_同步', 'Admin', 'Permission', 'Sync', 2, 'admin_permission_sync_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d28c-73c8-d195-f2de0713cbf3', '角色管理_查询', 'Admin', 'Role', 'Query', 0, 'admin_role_query_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d298-0e81-694f-723d60c55bda', '角色管理_添加', 'Admin', 'Role', 'Add', 2, 'admin_role_add_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d29d-7195-e52b-5b20e346f898', '角色管理_删除', 'Admin', 'Role', 'Delete', 3, 'admin_role_delete_delete', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2a5-3475-50d1-d3984f82f5d3', '角色管理_编辑', 'Admin', 'Role', 'Edit', 0, 'admin_role_edit_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2aa-77a2-7f52-72d9974f7020', '角色管理_修改', 'Admin', 'Role', 'Update', 2, 'admin_role_update_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2b5-55c5-995d-17557580db07', '角色管理_获取角色的关联菜单列表', 'Admin', 'Role', 'MenuList', 0, 'admin_role_menulist_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2b8-0db7-9575-bd6cd85f12b0', '角色管理_绑定菜单', 'Admin', 'Role', 'BindMenu', 2, 'admin_role_bindmenu_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2bc-3e4d-3993-a7a34ef134af', '角色管理_获取角色关联的菜单按钮列表', 'Admin', 'Role', 'MenuButtonList', 0, 'admin_role_menubuttonlist_get', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2c5-438b-194f-6b5f35cb587b', '角色管理_绑定菜单按钮', 'Admin', 'Role', 'BindMenuButton', 2, 'admin_role_bindmenubutton_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2cd-b7a0-c335-9b298cb1a765', '系统_修改系统配置', 'Admin', 'System', 'Config', 2, 'admin_system_config_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-10-24 13:31:33', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f08d5b-d2d4-846e-7503-ee323474339d', '系统_上传Logo', 'Admin', 'System', 'UploadLogo', 2, 'admin_system_uploadlogo_post', '2019-09-29 12:02:19', '39f08d5b-177c-a334-34e7-408ef121c6e0', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d70-dfc7-c5ea-3e8f366da479', '实体管理_查询', 'CodeGenerator', 'Class', 'Query', 0, 'codegenerator_class_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d7b-248e-08d0-b668e367e081', '实体管理_添加', 'CodeGenerator', 'Class', 'Add', 2, 'codegenerator_class_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d81-b442-7fa2-926c19e04836', '实体管理_删除', 'CodeGenerator', 'Class', 'Delete', 3, 'codegenerator_class_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d88-78d2-ca14-d5f41f3dbd96', '实体管理_编辑', 'CodeGenerator', 'Class', 'Edit', 0, 'codegenerator_class_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d8e-6bdb-4a7b-8222bc43dde6', '实体管理_修改', 'CodeGenerator', 'Class', 'Update', 2, 'codegenerator_class_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:11', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d94-b2e3-cae1-563d920a5072', '实体管理_生成代码', 'CodeGenerator', 'Class', 'BuildCode', 0, 'codegenerator_class_buildcode_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7d9a-e113-46aa-f6916583e5ab', '枚举管理_查询', 'CodeGenerator', 'Enum', 'Query', 0, 'codegenerator_enum_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7da0-2a3a-50fc-5116b3f0c98e', '枚举管理_添加', 'CodeGenerator', 'Enum', 'Add', 2, 'codegenerator_enum_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7da7-db7a-d3d4-6f44ae7d6f9c', '枚举管理_删除', 'CodeGenerator', 'Enum', 'Delete', 3, 'codegenerator_enum_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dad-fe9b-7bdf-866698d3c954', '枚举管理_编辑', 'CodeGenerator', 'Enum', 'Edit', 0, 'codegenerator_enum_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7db3-d92b-f9a2-41239eac4114', '枚举管理_修改', 'CodeGenerator', 'Enum', 'Update', 2, 'codegenerator_enum_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dbb-d157-03b2-99e38607552f', '枚举项管理_查询', 'CodeGenerator', 'EnumItem', 'Query', 0, 'codegenerator_enumitem_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dc1-e145-6b70-e6f97b3c1d31', '枚举项管理_添加', 'CodeGenerator', 'EnumItem', 'Add', 2, 'codegenerator_enumitem_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dc8-5f59-e6f5-64fc4448e9ff', '枚举项管理_删除', 'CodeGenerator', 'EnumItem', 'Delete', 3, 'codegenerator_enumitem_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dce-3613-be42-a3171afec2a9', '枚举项管理_编辑', 'CodeGenerator', 'EnumItem', 'Edit', 0, 'codegenerator_enumitem_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dd3-6338-a635-604a737aae56', '枚举项管理_修改', 'CodeGenerator', 'EnumItem', 'Update', 2, 'codegenerator_enumitem_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7ddb-5474-5952-33228a83d322', '枚举项管理_更新排序信息', 'CodeGenerator', 'EnumItem', 'Sort', 0, 'codegenerator_enumitem_sort_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7de0-9f12-bb80-281bd6527d57', '枚举项管理_更新排序信息', 'CodeGenerator', 'EnumItem', 'Sort', 2, 'codegenerator_enumitem_sort_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7de6-c1d3-7b4f-f5b8e90f4a1d', '模型属性管理_查询', 'CodeGenerator', 'ModelProperty', 'Query', 0, 'codegenerator_modelproperty_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7ded-3f1d-bf51-3c5e513e6a62', '模型属性管理_添加', 'CodeGenerator', 'ModelProperty', 'Add', 2, 'codegenerator_modelproperty_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7df3-9b33-a25b-a79ef2fd92d9', '模型属性管理_删除', 'CodeGenerator', 'ModelProperty', 'Delete', 3, 'codegenerator_modelproperty_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7dfa-6e07-451f-66a104202462', '模型属性管理_编辑', 'CodeGenerator', 'ModelProperty', 'Edit', 0, 'codegenerator_modelproperty_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e00-7a13-c788-75b4d9cba809', '模型属性管理_修改', 'CodeGenerator', 'ModelProperty', 'Update', 2, 'codegenerator_modelproperty_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e05-a9ab-1bb7-e95872fcc4a5', '模型属性管理_更新排序信息', 'CodeGenerator', 'ModelProperty', 'Sort', 0, 'codegenerator_modelproperty_sort_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e0d-0bb7-22b0-a8639cf60f95', '模型属性管理_更新排序信息', 'CodeGenerator', 'ModelProperty', 'Sort', 2, 'codegenerator_modelproperty_sort_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e13-9d06-296c-2aea20a52912', '模型属性管理_修改可空状态', 'CodeGenerator', 'ModelProperty', 'UpdateNullable', 2, 'codegenerator_modelproperty_updatenullable_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e19-1a8d-f880-33d698a44d4f', '模型属性管理_获取下拉列表', 'CodeGenerator', 'ModelProperty', 'Select', 0, 'codegenerator_modelproperty_select_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e20-f64b-6256-3fd67ca21b7b', '模型属性管理_从实体中导入属性', 'CodeGenerator', 'ModelProperty', 'ImportFromEntity', 2, 'codegenerator_modelproperty_importfromentity_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e25-7e1b-3c74-0a8fa17df3a8', '项目管理_查询', 'CodeGenerator', 'Project', 'Query', 0, 'codegenerator_project_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e2c-6a4e-012d-c16fa45125fd', '项目管理_添加', 'CodeGenerator', 'Project', 'Add', 2, 'codegenerator_project_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e33-4782-5ae1-eac0a534b43b', '项目管理_删除', 'CodeGenerator', 'Project', 'Delete', 3, 'codegenerator_project_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e39-1184-c52d-c6070907ee57', '项目管理_编辑', 'CodeGenerator', 'Project', 'Edit', 0, 'codegenerator_project_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e40-fdaf-12e2-6bacb9fb9b61', '项目管理_修改', 'CodeGenerator', 'Project', 'Update', 2, 'codegenerator_project_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e46-177d-d68f-2a986a622d20', '项目管理_生成代码', 'CodeGenerator', 'Project', 'BuildCode', 2, 'codegenerator_project_buildcode_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e4f-2478-d07f-a468b921ffcc', '实体属性管理_查询', 'CodeGenerator', 'Property', 'Query', 0, 'codegenerator_property_query_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e56-34df-5e29-2ef3d7b05503', '实体属性管理_添加', 'CodeGenerator', 'Property', 'Add', 2, 'codegenerator_property_add_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e5f-a482-76f6-f044498ac081', '实体属性管理_删除', 'CodeGenerator', 'Property', 'Delete', 3, 'codegenerator_property_delete_delete', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e66-db50-3afa-40065fd9b8e5', '实体属性管理_编辑', 'CodeGenerator', 'Property', 'Edit', 0, 'codegenerator_property_edit_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e6d-8b34-1c2d-eff59e252268', '实体属性管理_修改', 'CodeGenerator', 'Property', 'Update', 2, 'codegenerator_property_update_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:12', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e74-7b40-7391-1207895cb36a', '实体属性管理_获取属性类型下拉列表', 'CodeGenerator', 'Property', 'PropertyTypeSelect', 0, 'codegenerator_property_propertytypeselect_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:13', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e7a-3b08-fe4e-ec56986157e3', '实体属性管理_更新排序信息', 'CodeGenerator', 'Property', 'Sort', 0, 'codegenerator_property_sort_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:13', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e83-2d7c-dab5-07e0fb248723', '实体属性管理_更新排序信息', 'CodeGenerator', 'Property', 'Sort', 2, 'codegenerator_property_sort_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:13', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e89-829f-29cf-ceb718b6aefb', '实体属性管理_修改可空状态', 'CodeGenerator', 'Property', 'UpdateNullable', 2, 'codegenerator_property_updatenullable_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:13', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e91-74c1-aaa7-f64865dead3e', '实体属性管理_修改列表显示状态', 'CodeGenerator', 'Property', 'UpdateShowInList', 2, 'codegenerator_property_updateshowinlist_post', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:13', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f10e6c-7e97-a1c7-5a0a-4c3bef25f4e9', '实体属性管理_获取下拉列表', 'CodeGenerator', 'Property', 'Select', 0, 'codegenerator_property_select_get', '2019-10-24 13:31:32', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:13', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f1e767-0992-e8f1-6243-309421f490d3', '系统_修改系统基础配置', 'Admin', 'System', 'UpdateBaseConfig', 2, 'admin_system_updatebaseconfig_post', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f1e767-09e2-82f5-39fb-2b3855bfb370', '系统_修改系统组件配置', 'Admin', 'System', 'UpdateComponentConfig', 2, 'admin_system_updatecomponentconfig_post', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f1e767-0a17-3343-3537-bfede0e024ec', '系统_修改系统登录配置', 'Admin', 'System', 'UpdateLoginConfig', 2, 'admin_system_updateloginconfig_post', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f1e767-0a37-f5b3-d4de-cd8d690609c0', '系统_修改系统权限配置', 'Admin', 'System', 'UpdatePermissionConfig', 2, 'admin_system_updatepermissionconfig_post', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-INSERT INTO `permission` VALUES ('39f1e767-0a56-4d3a-33b0-3682eadf9e7c', '系统_修改系统权限配置', 'Admin', 'System', 'UpdateToolbarConfig', 2, 'admin_system_updatetoolbarconfig_post', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a', '2019-12-05 16:43:10', '2e23d1d9-4a72-acc2-f6ff-39ed21cb6a4a');
-
--- ----------------------------
--- Table structure for role
--- ----------------------------
-DROP TABLE IF EXISTS `role`;
-CREATE TABLE `role`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Remarks` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `IsSpecified` bit(1) NOT NULL DEFAULT b'0',
-  `CreatedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `CreatedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Deleted` bit(1) NOT NULL DEFAULT b'0',
-  `DeletedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `DeletedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of role
--- ----------------------------
-INSERT INTO `role` VALUES ('39f08d5b-173b-1cbb-7381-407c87b2e8e2', '超级管理员', '超级管理员', b'0', '2019-09-29 12:01:31', '00000000-0000-0000-0000-000000000000', '2019-09-29 12:01:31', '00000000-0000-0000-0000-000000000000', b'0', '2019-09-29 12:01:31', '00000000-0000-0000-0000-000000000000');
-
--- ----------------------------
--- Table structure for role_menu
--- ----------------------------
-DROP TABLE IF EXISTS `role_menu`;
-CREATE TABLE `role_menu`  (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `RoleId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `MenuId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 122 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of role_menu
--- ----------------------------
-INSERT INTO `role_menu` VALUES (106, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08dac-9b84-9a56-20b9-26789223a74f');
-INSERT INTO `role_menu` VALUES (107, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-7355-6fb9-cfe6-b9804de226f9');
-INSERT INTO `role_menu` VALUES (108, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-8081-2b67-5f77-3c4119b2ab66');
-INSERT INTO `role_menu` VALUES (109, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-8feb-d2ce-66dc-12fff451a969');
-INSERT INTO `role_menu` VALUES (110, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-9b05-80d5-a7f5-21e450af9b70');
-INSERT INTO `role_menu` VALUES (111, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-a689-5e91-dce9-e6d0088d29dc');
-INSERT INTO `role_menu` VALUES (112, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-b44b-8fbf-3a88-629dc0922e84');
-INSERT INTO `role_menu` VALUES (113, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08dac-84e1-54e2-22ee-e5d7e3606f90');
-INSERT INTO `role_menu` VALUES (114, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-e02b-bd7b-be06-12eeee0f4da4');
-INSERT INTO `role_menu` VALUES (115, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-f8f6-2dad-42c0-c73c787c6def');
-INSERT INTO `role_menu` VALUES (116, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08db0-067d-fc37-84cb-b5283891fcce');
-INSERT INTO `role_menu` VALUES (117, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f10ddc-b762-96c9-58a3-9ce21ae7ebcd');
-INSERT INTO `role_menu` VALUES (118, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08dad-aca0-7ddf-61d1-0b6ac0841b64');
-INSERT INTO `role_menu` VALUES (119, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f10e6c-c0c3-011e-b172-5cf586d41c10');
-INSERT INTO `role_menu` VALUES (120, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f10e6c-f280-2e8c-6eba-3ae5e3353366');
-INSERT INTO `role_menu` VALUES (121, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f10e6c-fce2-97c7-e3f7-0fe8be590899');
-
--- ----------------------------
--- Table structure for role_menu_button
--- ----------------------------
-DROP TABLE IF EXISTS `role_menu_button`;
-CREATE TABLE `role_menu_button`  (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `RoleId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `MenuId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ButtonId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 63 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of role_menu_button
--- ----------------------------
-INSERT INTO `role_menu_button` VALUES (30, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-7355-6fb9-cfe6-b9804de226f9', '39f08daf-7366-40d9-6116-510f50a9949b');
-INSERT INTO `role_menu_button` VALUES (31, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-7355-6fb9-cfe6-b9804de226f9', '39f08daf-7379-0830-a724-272048d335c4');
-INSERT INTO `role_menu_button` VALUES (32, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-8081-2b67-5f77-3c4119b2ab66', '39f08daf-8092-82f1-bf83-c74b15f5fae3');
-INSERT INTO `role_menu_button` VALUES (33, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-8feb-d2ce-66dc-12fff451a969', '39f08daf-8ff9-b2e7-f6ec-bbc690f7568a');
-INSERT INTO `role_menu_button` VALUES (34, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-8feb-d2ce-66dc-12fff451a969', '39f08daf-8ffe-d189-3f53-f2174cb2e3d4');
-INSERT INTO `role_menu_button` VALUES (35, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-8feb-d2ce-66dc-12fff451a969', '39f08daf-901a-ea1c-6dbc-fd3d68fb9757');
-INSERT INTO `role_menu_button` VALUES (36, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-8feb-d2ce-66dc-12fff451a969', '39f08daf-9020-8ebb-2d86-bd0adcd9d9dd');
-INSERT INTO `role_menu_button` VALUES (37, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-9b05-80d5-a7f5-21e450af9b70', '39f08daf-9b13-0809-b6f5-64d2430a37c4');
-INSERT INTO `role_menu_button` VALUES (38, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-9b05-80d5-a7f5-21e450af9b70', '39f08daf-9b1f-b315-ccc8-4ed480ae2595');
-INSERT INTO `role_menu_button` VALUES (39, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-9b05-80d5-a7f5-21e450af9b70', '39f08daf-9b28-8f39-eeb7-289ea4c44604');
-INSERT INTO `role_menu_button` VALUES (40, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-9b05-80d5-a7f5-21e450af9b70', '39f08daf-9b38-d4f7-270d-5e8629f9601d');
-INSERT INTO `role_menu_button` VALUES (41, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-a689-5e91-dce9-e6d0088d29dc', '39f08daf-a6a3-772f-7559-4a22f0614589');
-INSERT INTO `role_menu_button` VALUES (42, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-a689-5e91-dce9-e6d0088d29dc', '39f08daf-a6b0-0ea0-58c4-918941c668b2');
-INSERT INTO `role_menu_button` VALUES (43, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-a689-5e91-dce9-e6d0088d29dc', '39f08daf-a6b9-a4ac-5953-a4e4074ef3b0');
-INSERT INTO `role_menu_button` VALUES (44, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-a689-5e91-dce9-e6d0088d29dc', '39f08daf-a6cc-8c2f-e31a-9c91f6c6afce');
-INSERT INTO `role_menu_button` VALUES (45, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-b44b-8fbf-3a88-629dc0922e84', '39f08daf-b45e-0264-f197-063f969d3aa0');
-INSERT INTO `role_menu_button` VALUES (46, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-f8f6-2dad-42c0-c73c787c6def', '39f08daf-f905-e02f-341a-bbc0b80cbf5e');
-INSERT INTO `role_menu_button` VALUES (47, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-f8f6-2dad-42c0-c73c787c6def', '39f08daf-f909-628c-9a0a-2c23a57b9103');
-INSERT INTO `role_menu_button` VALUES (48, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f08daf-f8f6-2dad-42c0-c73c787c6def', '39f08daf-f915-e1f1-d7d8-ebd21adbebe6');
-INSERT INTO `role_menu_button` VALUES (56, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f10e6c-f280-2e8c-6eba-3ae5e3353366', '39f08db3-ea6b-6af7-1ef5-a226af30fbe4');
-INSERT INTO `role_menu_button` VALUES (57, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f10e6c-f280-2e8c-6eba-3ae5e3353366', '39f08db3-ea80-e0e3-69ea-af5ab431ac6f');
-INSERT INTO `role_menu_button` VALUES (58, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f10e6c-f280-2e8c-6eba-3ae5e3353366', '39f08db3-eaa7-e42f-34fb-25baaaf55e87');
-INSERT INTO `role_menu_button` VALUES (59, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f10e6c-f280-2e8c-6eba-3ae5e3353366', '39f08db3-eada-892b-b250-c2d58279d388');
-INSERT INTO `role_menu_button` VALUES (60, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f10e6c-fce2-97c7-e3f7-0fe8be590899', '39f08db3-f788-9a1c-f227-f372acb73cea');
-INSERT INTO `role_menu_button` VALUES (61, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f10e6c-fce2-97c7-e3f7-0fe8be590899', '39f08db3-f7ba-4c00-d053-ca662ef2ad06');
-INSERT INTO `role_menu_button` VALUES (62, '39f08d5b-173b-1cbb-7381-407c87b2e8e2', '39f10e6c-fce2-97c7-e3f7-0fe8be590899', '39f08db3-f7d6-7533-682f-739e51d10ae1');
-
-SET FOREIGN_KEY_CHECKS = 1;
diff --git a/data/MySql/nm_codegenerator.sql b/data/MySql/nm_codegenerator.sql
deleted file mode 100644
index fb90f02..0000000
--- a/data/MySql/nm_codegenerator.sql
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : localhost
- Source Server Type    : MySQL
- Source Server Version : 80015
- Source Host           : localhost:3306
- Source Schema         : nm_codegenerator
-
- Target Server Type    : MySQL
- Target Server Version : 80015
- File Encoding         : 65001
-
- Date: 29/09/2019 15:00:14
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for class
--- ----------------------------
-DROP TABLE IF EXISTS `class`;
-CREATE TABLE `class`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ProjectId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `TableName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `BaseEntityType` smallint(3) NOT NULL DEFAULT 0,
-  `Remarks` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `CreatedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `CreatedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for class_method
--- ----------------------------
-DROP TABLE IF EXISTS `class_method`;
-CREATE TABLE `class_method`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ClassId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Query` bit(1) NOT NULL DEFAULT b'0',
-  `Add` bit(1) NOT NULL DEFAULT b'0',
-  `Delete` bit(1) NOT NULL DEFAULT b'0',
-  `Edit` bit(1) NOT NULL DEFAULT b'0',
-  `CreatedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `CreatedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for enum
--- ----------------------------
-DROP TABLE IF EXISTS `enum`;
-CREATE TABLE `enum`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Remarks` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `CreatedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `CreatedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for enum_item
--- ----------------------------
-DROP TABLE IF EXISTS `enum_item`;
-CREATE TABLE `enum_item`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `EnumId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Value` int(11) NOT NULL DEFAULT 0,
-  `Remarks` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for model_property
--- ----------------------------
-DROP TABLE IF EXISTS `model_property`;
-CREATE TABLE `model_property`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ProjectId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ClassId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModelType` smallint(3) NOT NULL DEFAULT 0,
-  `Name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Type` smallint(3) NOT NULL DEFAULT 0,
-  `Nullable` bit(1) NOT NULL DEFAULT b'0',
-  `EnumId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Remarks` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Sort` int(11) NOT NULL DEFAULT 0,
-  `CreatedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `CreatedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for project
--- ----------------------------
-DROP TABLE IF EXISTS `project`;
-CREATE TABLE `project`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `No` int(11) NOT NULL DEFAULT 0,
-  `Code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Copyright` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `CreatedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `CreatedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Deleted` bit(1) NOT NULL DEFAULT b'0',
-  `DeletedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `DeletedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for property
--- ----------------------------
-DROP TABLE IF EXISTS `property`;
-CREATE TABLE `property`  (
-  `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ProjectId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ClassId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `IsPrimaryKey` bit(1) NOT NULL DEFAULT b'0',
-  `IsInherit` bit(1) NOT NULL DEFAULT b'0',
-  `Type` smallint(3) NOT NULL DEFAULT 0,
-  `Length` int(11) NOT NULL DEFAULT 0,
-  `Precision` int(11) NOT NULL DEFAULT 0,
-  `Scale` int(11) NOT NULL DEFAULT 0,
-  `EnumId` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Nullable` bit(1) NOT NULL DEFAULT b'0',
-  `Remarks` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `Sort` int(11) NOT NULL DEFAULT 0,
-  `ShowInList` bit(1) NOT NULL DEFAULT b'0',
-  `HasDefaultValue` bit(1) NOT NULL DEFAULT b'0',
-  `CreatedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `CreatedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ModifiedTime` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0),
-  `ModifiedBy` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  PRIMARY KEY (`Id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-
-SET FOREIGN_KEY_CHECKS = 1;
diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index 438aa4b6cd03e387b4cb73338cdbe4d6e4ee0693..105fd41656521411d824d01cc14e704f1307ec97 100644
GIT binary patch
literal 151552
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

literal 647168
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
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL
zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL
zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL
zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL
zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL
zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R(;_1SWKq+jibu*nRu1
z4^KS5^S|mp`GWug2q1s}0tg_000Ic41)BEjMhmx0*tO}}^wOhCGe;LsoLpR(TUees
zy0Wyqcw*-0($eL}pI<%qg^MpdSzB6K`|9^rfAF+p*+J2Eik5qw?Hwvr4msA8UvdK1
zDwl$WRjD<iVx?|HMc=op#n5S#ijG$bLeHt`ML76yH_zeC%H(L_{)rp<ule}=((=sG
z+^PB5<1-5@Cmx(THM1~#Vs7=tr&pi;-s+i8T>9p>2mN;0we$S;;KQ9fhc|!ys?oyC
zzPtM`{g|$K@!^@H#}}98W)>IpAM;1wH*;d~*zEDf?D3_!wLdt&dgdFePoKYd;p>-9
zzp(oFg|+9-u07UVJNwbqk9_B)XTCM)%1RYK&y@{6Jjio+v$}7zaAfZ-wdpVwk50@j
ztjw$|%)fs{;W|0DFn8=-r&i`JKmDcEPke6m>E|zh_=jsxerELtk6rw}{`dT#%Wx{W
zqQ=0(^990v?P$T@=eGl)8#2Ez^8v-DhaT0FacnNW6RT&=U;6BGFFpU%<@3!;Uu~{_
z>{*4O?}zR3l;>K$W##(ifrsacl<9|>*9ahh00IagfB*srAb<b@2q5swC-A=ki$er4

diff --git a/data/SqlServer/Nm_Admin.sql b/data/SqlServer/Nm_Admin.sql
deleted file mode 100644
index 614103d3a2f4b44fd145adfd9bf09b21e0cada93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 252188
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
IS;_1Ff9@*@SO5S3

diff --git a/data/SqlServer/Nm_CodeGenerator.sql b/data/SqlServer/Nm_CodeGenerator.sql
deleted file mode 100644
index bbf11091ba5b22b34f730caa7c0e2bc0d7332c03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21520
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
AVgLXD

diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index e5b2726..34827c0 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.9" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.6.6" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.5.0" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 804e09d..53240de 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.5.9" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.5.9" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.5.9" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.6.6" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.6.6" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.6.2" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 7b0e2e7..2c6ea39 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -7,7 +7,7 @@
   <Import Project="..\..\..\build\module.build.targets" />
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.5.11" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.6.3" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index 6a88dd2..ea87b7d 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netmodular-module-code-generator",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "author": "Oldli",
   "license": "ISC",
   "code": "codeGenerator",
@@ -18,15 +18,15 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.1.4",
-    "netmodular-ui": "^1.3.3"
+    "netmodular-module-admin": "^1.1.5",
+    "netmodular-ui": "^1.4.0"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.1.1",
-    "@vue/cli-plugin-eslint": "^4.1.1",
-    "@vue/cli-plugin-router": "^4.1.1",
-    "@vue/cli-plugin-vuex": "^4.1.1",
-    "@vue/cli-service": "^4.1.1",
+    "@vue/cli-plugin-babel": "^4.1.2",
+    "@vue/cli-plugin-eslint": "^4.1.2",
+    "@vue/cli-plugin-router": "^4.1.2",
+    "@vue/cli-plugin-vuex": "^4.1.2",
+    "@vue/cli-service": "^4.1.2",
     "@vue/eslint-config-prettier": "^5.0.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^5.16.0",
@@ -35,8 +35,8 @@
     "prettier": "^1.18.2",
     "raw-loader": "^3.1.0",
     "rimraf": "^3.0.0",
-    "sass": "^1.22.10",
-    "sass-loader": "^8.0.0",
+    "sass": "^1.24.4",
+    "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.11"
   }
-}
+}
\ No newline at end of file
diff --git a/src/UI/module-code-generator/src/views/enum/index/page.js b/src/UI/module-code-generator/src/views/enum/index/page.js
index d7cec1a..0212e77 100644
--- a/src/UI/module-code-generator/src/views/enum/index/page.js
+++ b/src/UI/module-code-generator/src/views/enum/index/page.js
@@ -1,6 +1,7 @@
 /** 页面信息 */
 const page = new (function() {
   this.title = '枚举列表'
+  this.icon = 'tag'
   this.name = 'codegenerator_enum'
   this.path = '/codegenerator/enum'
   // 关联权限
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index f1ab2cc..07a4807 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -7,8 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.4" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.5.2" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.5.9" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.5.4" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.6.2" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.5.1" />
   </ItemGroup>
   
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 076c6f3..6843141 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -6,12 +6,12 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.5.3" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.5.9" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.5.9" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.5.9" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.6.6" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.6.6" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.6.6" />
     <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.5.0" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.4" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.5.11" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.9" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.6.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/config/db.json b/src/WebHost/config/db.json
index 76c2f83..fc859b2 100644
--- a/src/WebHost/config/db.json
+++ b/src/WebHost/config/db.json
@@ -14,7 +14,7 @@
   //����
   "Password": "",
   //�Ƿ񴴽����ݿ�ͱ�
-  "CreateDatabase": false,
+  "CreateDatabase": true,
   //ģ���б�
   "Modules": [
     {

From c56b5089790ce1074fd3c886efff0c533d3ed135 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Fri, 17 Jan 2020 10:39:36 +0800
Subject: [PATCH 18/71] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90loading=E5=85=B3=E9=97=AD=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UI/module-code-generator/package.json                     | 2 +-
 .../module-code-generator/src/views/project/index/index.vue   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index ea87b7d..cccf14f 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netmodular-module-code-generator",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "author": "Oldli",
   "license": "ISC",
   "code": "codeGenerator",
diff --git a/src/UI/module-code-generator/src/views/project/index/index.vue b/src/UI/module-code-generator/src/views/project/index/index.vue
index fbf3b4d..1158d68 100644
--- a/src/UI/module-code-generator/src/views/project/index/index.vue
+++ b/src/UI/module-code-generator/src/views/project/index/index.vue
@@ -70,10 +70,10 @@ export default {
       api
         .buildCode({ id: row.id })
         .then(() => {
-          this._closenLoading()
+          this._closeLoading()
         })
         .catch(() => {
-          this._closenLoading()
+          this._closeLoading()
         })
     },
     manageClass(row) {

From a699e12d9386e87970b378c87fffdc5f5bd52f66 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Sun, 19 Jan 2020 17:42:12 +0800
Subject: [PATCH 19/71] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/SQLite/Nm_Admin.db                       | Bin 151552 -> 151552 bytes
 data/SQLite/Nm_CodeGenerator.db               | Bin 86016 -> 86016 bytes
 src/Directory.Build.props                     |   2 +-
 src/Library/Application/Application.csproj    |   4 +-
 .../ProjectService/ProjectService.cs          |   3 +-
 .../ViewModels/ProjectAddModel.cs             |   1 +
 src/Library/Domain/Domain.csproj              |   6 +--
 .../Infrastructure/Infrastructure.csproj      |   2 +-
 .../Default/T4/Gitattributes.Extend.cs        |   2 +
 .../Templates/Default/T4/Gitignore.Extend.cs  |   2 +
 .../Templates/Default/T4/Readme.Extend.cs     |   2 +
 .../Templates/Default/T4/Solution.Extend.cs   |   2 +
 .../T4/build/ModuleBuildTargets.Extend.cs     |   2 +
 .../Default/T4/script/NpmInstall.Extend.cs    |   7 ++-
 .../Default/T4/script/NpmPublish.Extend.cs    |   2 +
 .../Default/T4/script/NpmUpdate.Extend.cs     |   2 +
 .../T4/src/DirectoryBuildProps.Extend.cs      |   2 +
 .../src/Library/Application/Csproj.Extend.cs  |   3 ++
 .../Application/MapperConfig.Extend.cs        |   2 +
 .../Library/Application/ServiceImpl.Extend.cs |   2 +
 .../Application/ServiceInterface.Extend.cs    |   2 +
 .../Application/ViewModels/AddModel.Extend.cs |   2 +
 .../ViewModels/UpdateModel.Extend.cs          |   3 ++
 .../T4/src/Library/Domain/Csproj.Extend.cs    |   2 +
 .../T4/src/Library/Domain/Entity.Extend.cs    |   2 +
 .../src/Library/Domain/EntityExtend.Extend.cs |   2 +
 .../Domain/Models/QueryModel.Extend.cs        |   2 +
 .../src/Library/Domain/Repository.Extend.cs   |   2 +
 .../Library/Infrastructure/Csproj.Extend.cs   |   2 +
 .../Options/ModuleOptionsConfigure.Extend.cs  |   1 +
 .../Infrastructure/Options/Options.Extend.cs  |   1 +
 .../Repositories/DbContext.Extend.cs          |   3 +-
 .../Repositories/MySqlRepository.Extend.cs    |   1 +
 .../PostgreSQLRepository.Extend.cs            |   3 +-
 .../Repositories/SQLiteRepository.Extend.cs   |   1 +
 .../SqlServerRepository.Extend.cs             |   2 +
 .../T4/src/UI/App/BabelConfig.Extend.cs       |   2 +
 .../T4/src/UI/App/Browserslistrc.Extend.cs    |   2 +
 .../Default/T4/src/UI/App/Eslintrc.Extend.cs  |   2 +
 .../Default/T4/src/UI/App/Package.Extend.cs   |   2 +
 .../T4/src/UI/App/PostcssConfig.Extend.cs     |   2 +
 .../T4/src/UI/App/Prettierrc.Extend.cs        |   2 +
 .../Default/T4/src/UI/App/VueConfig.Extend.cs |   2 +
 .../Default/T4/src/UI/App/src/Index.Extend.cs |   2 +
 .../Default/T4/src/UI/App/src/Main.Extend.cs  |   2 +
 .../T4/src/UI/App/src/Module.Extend.cs        |   2 +
 .../T4/src/UI/App/src/api/Index.Extend.cs     |   2 +
 .../App/src/api/components/Entity.Extend.cs   |   7 ++-
 .../App/src/components/Components.Extend.cs   |   2 +
 .../T4/src/UI/App/src/config/Config.Extend.cs |   2 +
 .../T4/src/UI/App/src/routes/Routes.Extend.cs |   2 +
 .../T4/src/UI/App/src/store/Store.Extend.cs   |   2 +
 .../src/views/components/SavePage.Extend.cs   |   2 +
 .../src/UI/App/src/views/index/Cols.Extend.cs |   2 +
 .../UI/App/src/views/index/Index.Extend.cs    |   2 +
 .../src/UI/App/src/views/index/Page.Extend.cs |   2 +
 .../T4/src/UI/App/vscode/settings.Extend.cs   |   2 +
 .../src/Web/Controllers/Controller.Extend.cs  |   2 +
 .../Default/T4/src/Web/Csproj.Extend.cs       |   2 +
 .../T4/src/Web/ModuleController.Extend.cs     |   2 +
 .../T4/src/Web/ModuleInitializer.Extend.cs    |   2 +
 .../Default/T4/src/WebHost/Csproj.Extend.cs   |   2 +
 .../Default/T4/src/WebHost/Program.Extend.cs  |  40 +++++++++---------
 .../Default/T4/src/WebHost/Startup.Extend.cs  |   2 +
 .../T4/src/WebHost/config/cache.Extend.cs     |   2 +
 .../WebHost/config/cacheDevelopment.Extend.cs |   4 +-
 .../T4/src/WebHost/config/db.Extend.cs        |   2 +
 .../WebHost/config/dbDevelopment.Extend.cs    |   2 +
 .../T4/src/WebHost/config/excel.Extend.cs     |   2 +
 .../WebHost/config/excelDevelopment.Extend.cs |   2 +
 .../T4/src/WebHost/config/host.Extend.cs      |   2 +
 .../WebHost/config/hostDevelopment.Extend.cs  |   2 +
 .../T4/src/WebHost/config/jwt.Extend.cs       |   2 +
 .../WebHost/config/jwtDevelopment.Extend.cs   |   2 +
 .../T4/src/WebHost/config/logging.Extend.cs   |  36 ++++++++--------
 .../config/loggingDevelopment.Extend.cs       |   2 +
 .../T4/src/WebHost/config/module.Extend.cs    |   2 +
 .../config/moduleDevelopment.Extend.cs        |   2 +
 .../Templates/ITemplateHandler.cs             |   5 +++
 .../Templates/Models/TemplateBuildModel.cs    |   5 +++
 .../Templates/TemplateBuilderAbstract.cs      |   3 +-
 .../_modules/CodeGenerator/_module.json       |   2 +-
 src/UI/module-code-generator/package.json     |   6 +--
 src/UI/module-code-generator/src/index.js     |   2 +-
 .../src/views/class/index/index.vue           |  15 ++++---
 .../modelProperty/components/list/index.vue   |   2 +-
 .../src/views/modelProperty/index/index.vue   |   6 ++-
 .../views/project/components/save/index.vue   |   6 ++-
 .../src/views/project/index/index.vue         |   4 +-
 .../src/views/project/index/page.js           |  11 ++++-
 .../src/views/property/index/index.vue        |   8 ++--
 src/Web/Web.csproj                            |   8 ++--
 src/WebHost/WebHost.csproj                    |  14 +++---
 93 files changed, 250 insertions(+), 89 deletions(-)

diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index 105fd41656521411d824d01cc14e704f1307ec97..d4ea93f04c0f30d8f5bef75ecfec664177bc8f1c 100644
GIT binary patch
delta 886
zcmaiyUr19?9LMi(yW8%ayVGT+mToz>^=D4*z1zKan~6@HwV)(p7!l-35n?&b(l`G!
z6p0|^Bp1qR(u+@)%oq};_K=!di4RtUVW^8<f_ms7jPBG2>&0^(4(I&N_jA6#FQ+|1
zwnxaG1JKf&RSGS`)s7J8QC}z*bZ9hW1Y7h|=x~Z$FY7|8_5zu#E2>K=k;xkMXeG>|
z&z%Niskgk$MmuPS&C7Zjo5#cOHV5zExe|dcDQEb`Z0Ty1c*P3)qrvcKP_Crh5@cC}
zlp7rAqQ^F-jdFdG9jPLP()o8adh(XY*^R1?U9iHpy?cl*;xv(}S|X>(TcnRv5n~dg
zO(iZJhd9{8@e|-v<l$J+S+U0l`@~!y98y?u%u|ur(_)(sG;mbB?Sn%6h;&W7<Ae0r
zst=47ycyFrOR%6eBdmfnKaqaQKvAUzk|^~jrnDfqXA(zRK}d5QWCS-uyBRj07iiAq
z<QZ0o{b>cc$3T9>G<YqRoToiUb!hsNM$~hP^Tcl=Q^hMQ@mlE#FV1va)2sc0IrU5e
zZFiNky9I!XH`0>Vh90htq4>~1yr=7Wpl-8A%jIC8sp;a?Kz*RDmZe$RMl&`>GRV0(
zmz&}9T`r#I9inau%&5AL)cs%LQBJ=_c_TC7M_ic!uXgqM<9MW_Ce%_N3<YYok}P`-
zmH$ZX3@31ixo^<~vekaZkXn#vMXa`hDHeVORdO7|uphDI8Hm76p;K^if-@l$pUuK>
z$__hDnzy^qid5;JgQq)10?SJoi#h_#v77VIdC4G8CSZyBrTLQdK|N2-5wof(<x9m2
zd_q1hdxK5(_TER6?;14gg9B?1#I<hm>%d?lLR7g>u@lS*y!4k738422KlPI3j(Tl|
zpCbHbN*bvYK@vbwB(>RGQH9Ke)QcwV7B+tO(Rz1JpaB&xp4^5yrO@+PyL~%xOKid}
HE6(~0VY3NI

delta 432
zcmZozz}c{XbAmKu{6raN#`uj1Ci#rAlc(k@GYU-JnXkmCvH4EEh5)lH)6dE54c40l
z1-3IW70OP2*c?7ROPf(@b58Tl9A+zCHlWNsp2=)~O&R$&+x$JD#4O7lGnst>NQV^n
z<n`ydx2J0}-WL(#Ji*z;>B-5?v6rKb!;eFl{W?%ZJ^S?Q?u^eFRi^LvVDw~FW?`@o
zo<6~oQEa-hC!;#65(|T)KZtKIz21|Nhf#5Qk0+xoivm#D^nOo9@$FAM8I{ynDj4`G
zfQIGqNi?%EiiUEC`^xk3I!kkMIER8DkebXmOJ(||I!1G069q$4D-#PVBO^T%Q&V$O
zV`GEu|LPc-9c3997`WMj82EMgB6u5l=5TM}I>UL3<2Q#SyBS*$(0CIz-o`{(u24gH
zVQY}F(-X8ARkk-DV+?0zY0Q`8+J5gO;{wKM#~C>|jm-7TjEybKOr|%AGpbGBdYW+~
zNPN2f8Ac8!6SL`p9E_^d=bm9)4-#busy4ASvY7mFmfH5lvy5#?><s)IjMsU;Z|1x3
OmVdIsEY@WXOacI<e0^5{

diff --git a/data/SQLite/Nm_CodeGenerator.db b/data/SQLite/Nm_CodeGenerator.db
index d4ab4f84c9fae9651e7e33d37c89496d0136c67e..130f35ee1c70f01716af2a70abe63111ec26ef31 100644
GIT binary patch
delta 1991
zcma)-OKcle6ozv>sXJpkc0zDSDS6QPmB+R2bMA~2O6OUD1hk9Ul%l3m3!6&3x&anR
zyZ}))pb;9e3lc)@s=zE*RFx_O5?xVtNUf;Yf)L9}thf`$WSovGk7m3%NB4Z^|Ia<%
z+BvkfbLi8f;Ob}3IN<8H8(%FbE82W`c=4rz_JejxdrO<wzKAa@-d3X<6>xZyIG*Q2
zA{d6Qk6dW`CW1mB+cI^*bwO5IN&u+orxGn}Bk1eC4?V*$F=5Q7f-OIqXj=}31luOG
zxartj7)WRKQY!J(UTxnZ9<)4RLen*{ZyP=_xz$Q#?j<thI}lObhTO5J?sM!B!)V5T
zEgi`hl+qng{&C{x(w%q;-7KBm{y>=ss-RkR0w>U%px1^Ypp7Vl)HNvN)S=Mi1|v2j
zx`V`(OYdIEB|phW5J3=Oh|NXJI|z3WX=B0}4e?y-NOp`-5pGO3X7{6_gXK%woJyH!
zcz(M6>e%*sIf<t2p;>!qwhdjv9cX$Efwp1lP`7MMkS?(68usNk-{^m7GS*>62eCH8
z9P1>SngR8vhsKlo&8H5+@ix+lWP5wA5&v}Jc@U59d|Y`&dj5E^lzoF9kDhBPffjDv
zs(p9*iH%(06Y0<Uh0Q;LpepT2+(}IscA#Z>6#6D%5IMeWS*}lQfkw42aW4O;eT;RG
z(Pp}CP(<ZfD7-j*Y{0}+21!h;#g}h>J)Wx+<EfMXmY0`Cfy^h8gj4rx;kjR~P3DWm
zvC3-s?8HZ<xcHzb4?+(Mo7-pd#URk+bD(ug&Y~lg<lJ*17MwF-Gwe}ol*(z#d8gNl
zj*&rhJ?YkPd>0y?yyMa0444_1kb!hlPC-3>aIZc-nXgFv-zqmMA68zguw5M<mUkCN
zqrVS^BKL&&`(7<R_s_M{lX>;}So!Y6m!;Q>4ed|$y4*pZt4jC8O7y!4W}odJH*^n$
zXP&IpMv);p-vL&JtsGH<ng{P@zw=%++@7r~U2{2FSQ})@UU{Q4?W}?Inf*(bt{MRy
zG>>MP*JI+zAg*<vTdD>@a9q`Zs;Yrn&#CHx;gQm1F5K|fxz_*s4!vB_{dI71m~0|}
zXbg>-3F3O!XeEdXeZ+-K#OzI<DA^jtUFV%k7ou-;uo}KNUrg=Tl%hh2WXEOG%HS@o
u(p_yvw~h_Eoc-sLur)_vd*R}EWE}^q*_9c>bhwI4uB1f8@9(}05cm(F{LL}|

delta 210
zcmZozz}m2Yb%Hcw-9#B@#=4COOXQi=IA2d@SMc2|XfT~~`g(pw_RXI(h1fV4`HnE~
z9pU5JEa-5Ahl$x}bE3j0#?43U92hwm`EM}r-{4=rSukK3KcnWviK;B>%%Pl<8}_Pf
z3J^*FniS5>{5CXnbI$H%EI|EA{9tn@i`-G19CLmJA1n8L27VpBDBgCS&D{5a%Fl9d
xzJFVlg^!ir1Z*&W8-Fan36jnaw-q<Xyk8N(#>jVpf$suP<{01h3x13Si~y-VM4A8q

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 2881668..8af4eba 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,7 +3,7 @@
     <Id>CodeGenerator</Id>
     <Name>代码生成器</Name>
     <Authors>Oldli</Authors>
-    <Version>1.5.8</Version>
+    <Version>1.5.9</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 34827c0..f6530d2 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.6.6" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.5.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.6.7" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.5.1" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Application/ProjectService/ProjectService.cs b/src/Library/Application/ProjectService/ProjectService.cs
index f452919..30d1b96 100644
--- a/src/Library/Application/ProjectService/ProjectService.cs
+++ b/src/Library/Application/ProjectService/ProjectService.cs
@@ -122,7 +122,6 @@ public async Task<IResultModel> Update(ProjectUpdateModel model)
             _mapper.Map(model, entity);
 
             var result = await _repository.UpdateAsync(entity);
-
             return ResultModel.Result(result);
         }
 
@@ -155,6 +154,8 @@ public async Task<IResultModel<ProjectBuildCodeResultModel>> BuildCode(Guid proj
 
             if (classList == null)
             {
+                //如果classList参数为null，表示生成整个解决方案
+                buildModel.GenerateSln = true;
                 classList = await _classRepository.QueryAllByProject(project.Id);
             }
 
diff --git a/src/Library/Application/ProjectService/ViewModels/ProjectAddModel.cs b/src/Library/Application/ProjectService/ViewModels/ProjectAddModel.cs
index cf5a557..f9cfdfb 100644
--- a/src/Library/Application/ProjectService/ViewModels/ProjectAddModel.cs
+++ b/src/Library/Application/ProjectService/ViewModels/ProjectAddModel.cs
@@ -16,6 +16,7 @@ public class ProjectAddModel
         /// <summary>
         /// 编号
         /// </summary>
+        [Range(0, 59315, ErrorMessage = "编码在 0 到 59315 之间")]
         public int No { get; set; }
 
         /// <summary>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 53240de..6a9e035 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.6.6" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.6.6" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.6.2" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.6.7" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.6.7" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.6.5" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 2c6ea39..6c8d079 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -7,7 +7,7 @@
   <Import Project="..\..\..\build\module.build.targets" />
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.6.3" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.6.6" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Gitattributes.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/Gitattributes.Extend.cs
index bd041bd..41ccd37 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Gitattributes.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Gitattributes.Extend.cs
@@ -12,6 +12,8 @@ public Gitattributes(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var content = TransformText();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Gitignore.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/Gitignore.Extend.cs
index 7726704..a5724dc 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Gitignore.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Gitignore.Extend.cs
@@ -12,6 +12,8 @@ public Gitignore(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var content = TransformText();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Readme.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/Readme.Extend.cs
index 72f9db0..98712be 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Readme.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Readme.Extend.cs
@@ -12,6 +12,8 @@ public Readme(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var content = TransformText();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Solution.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/Solution.Extend.cs
index ba934a9..a7e172b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Solution.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Solution.Extend.cs
@@ -12,6 +12,8 @@ public Solution(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var content = TransformText();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.Extend.cs
index c21bbe3..7da2cf3 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.Extend.cs
@@ -12,6 +12,8 @@ public ModuleBuildTargets(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "build");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.Extend.cs
index 60bad27..c79e85e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.Extend.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
+using System.IO;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.script
@@ -15,6 +12,8 @@ public NpmInstall(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "script");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.Extend.cs
index 32e2527..dc0c1b5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.Extend.cs
@@ -12,6 +12,8 @@ public NpmPublish(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "script");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.Extend.cs
index dbbe31b..231f1a0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.Extend.cs
@@ -12,6 +12,8 @@ public NpmUpdate(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "script");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs
index 970c9a2..6a281cd 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs
@@ -14,6 +14,8 @@ public DirectoryBuildProps(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs
index 9407f0d..eacfff5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs
@@ -13,6 +13,9 @@ public Csproj(TemplateBuildModel model)
             _model = model;
             _prefix = model.Project.Prefix;
         }
+
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/Library/Application");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.Extend.cs
index 23bf3f6..ab7f922 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.Extend.cs
@@ -16,6 +16,8 @@ public MapperConfig(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.Extend.cs
index 327077e..019bad4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.Extend.cs
@@ -16,6 +16,8 @@ public ServiceImpl(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.Extend.cs
index d341de0..ff5bd46 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.Extend.cs
@@ -16,6 +16,8 @@ public ServiceInterface(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.Extend.cs
index e709d9b..943b134 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.Extend.cs
@@ -16,6 +16,8 @@ public AddModel(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.Extend.cs
index 76e9fe2..0728497 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.Extend.cs
@@ -16,6 +16,9 @@ public UpdateModel(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => false;
+
+
         public void Save()
         {
             if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs
index 0e49cc6..53a2df1 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs
@@ -14,6 +14,8 @@ public Csproj(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/Library/Domain");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.Extend.cs
index 23ce4e1..e7711e2 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.Extend.cs
@@ -27,6 +27,8 @@ public Entity(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.Extend.cs
index 9959d93..9753e8e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.Extend.cs
@@ -16,6 +16,8 @@ public EntityExtend(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.Extend.cs
index c253cac..8ad65c4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.Extend.cs
@@ -19,6 +19,8 @@ public QueryModel(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.Extend.cs
index 7372d2b..62d240e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.Extend.cs
@@ -16,6 +16,8 @@ public Repository(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs
index 331888a..940d2d7 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs
@@ -14,6 +14,8 @@ public Csproj(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.Extend.cs
index 96e18c3..9067f3d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.Extend.cs
@@ -14,6 +14,7 @@ public ModuleOptionsConfigure(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => true;
 
         public void Save()
         {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.Extend.cs
index 9373574..4111243 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.Extend.cs
@@ -14,6 +14,7 @@ public Options(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => true;
 
         public void Save()
         {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.Extend.cs
index b0383b3..dc9283b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.Extend.cs
@@ -13,7 +13,8 @@ public DbContext(TemplateBuildModel model)
             _model = model;
             _prefix = model.Project.Prefix;
         }
-
+        
+        public bool IsGlobal => true;
 
         public void Save()
         {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.Extend.cs
index b2b763d..c223760 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.Extend.cs
@@ -16,6 +16,7 @@ public MySqlRepository(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => false;
 
         public void Save()
         {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs
index 920f99d..1750b6c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs
@@ -18,7 +18,8 @@ public PostgreSQLRepository(TemplateBuildModel model)
             _model = model;
             _prefix = model.Project.Prefix;
         }
-
+        
+        public bool IsGlobal => false;
 
         public void Save()
         {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.Extend.cs
index 1224955..f6966f5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.Extend.cs
@@ -16,6 +16,7 @@ public SQLiteRepository(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => false;
 
         public void Save()
         {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.Extend.cs
index a150fe0..bbbb681 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.Extend.cs
@@ -16,6 +16,8 @@ public SqlServerRepository(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure/Repositories/SqlServer");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.Extend.cs
index 0e5c3dc..a50e26e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.Extend.cs
@@ -12,6 +12,8 @@ public BabelConfig(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.Extend.cs
index a8f2342..a95153d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.Extend.cs
@@ -12,6 +12,8 @@ public Browserslistrc(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.Extend.cs
index 790d38a..b8d9766 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.Extend.cs
@@ -12,6 +12,8 @@ public Eslintrc(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.Extend.cs
index 4a898e5..f028115 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.Extend.cs
@@ -14,6 +14,8 @@ public Package(TemplateBuildModel model)
             _prefix = _model.Project.Prefix.ToLower();
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.Extend.cs
index 49a26c4..1035b89 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.Extend.cs
@@ -12,6 +12,8 @@ public PostcssConfig(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.Extend.cs
index a334569..91bd69f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.Extend.cs
@@ -12,6 +12,8 @@ public Prettierrc(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.Extend.cs
index 541dbe6..9de7174 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.Extend.cs
@@ -14,6 +14,8 @@ public VueConfig(TemplateBuildModel model)
             _prefix = _model.Project.Prefix.ToLower();
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.Extend.cs
index 0ec7f4f..89f6556 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.Extend.cs
@@ -12,6 +12,8 @@ public Index(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.Extend.cs
index 1b5b6e6..0b293b6 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.Extend.cs
@@ -14,6 +14,8 @@ public Main(TemplateBuildModel model)
             _prefix = _model.Project.Prefix.ToLower();
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.Extend.cs
index dc15055..9c014a8 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.Extend.cs
@@ -12,6 +12,8 @@ public Module(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.Extend.cs
index 5e821da..badb2dd 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.Extend.cs
@@ -12,6 +12,8 @@ public Index(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/api");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs
index b695730..c79716d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using System.Linq;
-using System.Text;
 using NetModular.Lib.Utils.Core.Extensions;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
@@ -18,6 +15,8 @@ public Entity(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath,
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
index 14b249e..9ffb085 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
@@ -16,6 +16,8 @@ public Components(TemplateBuildModel model)
             _uiPrefix = _model.Project.UIPrefix.ToLower();
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/components");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.Extend.cs
index 56b3ff0..91c011d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.Extend.cs
@@ -12,6 +12,8 @@ public Config(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/config");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.Extend.cs
index 42c7331..9ee83f0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.Extend.cs
@@ -14,6 +14,8 @@ public Routes(TemplateBuildModel model)
             _prefix = _model.Project.Prefix.ToLower();
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/routes");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.Extend.cs
index 953dd86..34fe76a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.Extend.cs
@@ -12,6 +12,8 @@ public Store(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/store");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs
index 38f6988..b8f929c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs
@@ -19,6 +19,8 @@ public SavePage(TemplateBuildModel model)
             _uiPrefix = _model.Project.UIPrefix.ToLower();
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs
index 0a0bd2d..e6d970b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs
@@ -17,6 +17,8 @@ public Cols(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
index 0d55904..d16647b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
@@ -17,6 +17,8 @@ public Index(TemplateBuildModel model)
             _uiPrefix = _model.Project.UIPrefix.ToLower();
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs
index 912ec14..e91c5e4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs
@@ -15,6 +15,8 @@ public Page(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.Extend.cs
index b8f551c..6617914 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.Extend.cs
@@ -12,6 +12,8 @@ public settings(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var content = TransformText();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.Extend.cs
index dcde55e..b6d8f19 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.Extend.cs
@@ -16,6 +16,8 @@ public Controller(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => false;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/Web/Controllers");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs
index 5c2fb0f..5dd0c8a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs
@@ -14,6 +14,8 @@ public Csproj(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/Web");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.Extend.cs
index 4003679..5bb68a4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.Extend.cs
@@ -14,6 +14,8 @@ public ModuleController(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/Web");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.Extend.cs
index 6781bfb..c849093 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.Extend.cs
@@ -14,6 +14,8 @@ public ModuleInitializer(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/Web");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs
index 82c7d60..95cb1d8 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs
@@ -14,6 +14,8 @@ public Csproj(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.Extend.cs
index aee8310..afe0ac5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.Extend.cs
@@ -3,26 +3,28 @@
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost
 {
-   public partial class Program : ITemplateHandler
-   {
-       private readonly TemplateBuildModel _model;
-       private readonly string _prefix;
+    public partial class Program : ITemplateHandler
+    {
+        private readonly TemplateBuildModel _model;
+        private readonly string _prefix;
 
-       public Program(TemplateBuildModel model)
-       {
-           _model = model;
-           _prefix = model.Project.Prefix;
-       }
+        public Program(TemplateBuildModel model)
+        {
+            _model = model;
+            _prefix = model.Project.Prefix;
+        }
 
-       public void Save()
-       {
-           var dir = Path.Combine(_model.RootPath, "src/WebHost");
-           if (!Directory.Exists(dir))
-               Directory.CreateDirectory(dir);
+        public bool IsGlobal => true;
 
-           var content = TransformText();
-           var filePath = Path.Combine(dir, "Program.cs");
-           File.WriteAllText(filePath, content);
-       }
-   }
+        public void Save()
+        {
+            var dir = Path.Combine(_model.RootPath, "src/WebHost");
+            if (!Directory.Exists(dir))
+                Directory.CreateDirectory(dir);
+
+            var content = TransformText();
+            var filePath = Path.Combine(dir, "Program.cs");
+            File.WriteAllText(filePath, content);
+        }
+    }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs
index db0b2b1..4ccb3ca 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs
@@ -14,6 +14,8 @@ public Startup(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs
index ab32ed5..7a4b15f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs
@@ -14,6 +14,8 @@ public cache(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs
index 237148b..c16c923 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs
@@ -14,6 +14,8 @@ public cacheDevelopment(TemplateBuildModel model)
             _prefix = model.Project.Prefix;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
@@ -21,7 +23,7 @@ public void Save()
                 Directory.CreateDirectory(dir);
 
             var content = TransformText();
-            var filePath = Path.Combine(dir, "cache.evelopment.json");
+            var filePath = Path.Combine(dir, "cache.Development.json");
             File.WriteAllText(filePath, content);
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
index 37e4f84..fa5d6ef 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
@@ -14,6 +14,8 @@ public db(TemplateBuildModel model)
             _dbPrefix = model.Project.UIPrefix;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.Extend.cs
index ce7e355..814984d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.Extend.cs
@@ -12,6 +12,8 @@ public dbDevelopment(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.Extend.cs
index 8c17372..dfcf991 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.Extend.cs
@@ -12,6 +12,8 @@ public excel(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.Extend.cs
index 323c280..4d88d31 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.Extend.cs
@@ -12,6 +12,8 @@ public excelDevelopment(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.Extend.cs
index 879acbc..8c48813 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.Extend.cs
@@ -12,6 +12,8 @@ public host(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.Extend.cs
index 62425d9..bf21948 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.Extend.cs
@@ -12,6 +12,8 @@ public hostDevelopment(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.Extend.cs
index 42800b2..3024882 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.Extend.cs
@@ -12,6 +12,8 @@ public jwt(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.Extend.cs
index 884277c..718889c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.Extend.cs
@@ -12,6 +12,8 @@ public jwtDevelopment(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.Extend.cs
index 4fbc3a2..c8af83c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.Extend.cs
@@ -3,24 +3,26 @@
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
 {
-   public partial class logging : ITemplateHandler
-   {
-       private readonly TemplateBuildModel _model;
+    public partial class logging : ITemplateHandler
+    {
+        private readonly TemplateBuildModel _model;
 
-       public logging(TemplateBuildModel model)
-       {
-           _model = model;
-       }
+        public logging(TemplateBuildModel model)
+        {
+            _model = model;
+        }
 
-       public void Save()
-       {
-           var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
-           if (!Directory.Exists(dir))
-               Directory.CreateDirectory(dir);
+        public bool IsGlobal => true;
 
-           var content = TransformText();
-           var filePath = Path.Combine(dir, "logging.json");
-           File.WriteAllText(filePath, content);
-       }
-   }
+        public void Save()
+        {
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
+            if (!Directory.Exists(dir))
+                Directory.CreateDirectory(dir);
+
+            var content = TransformText();
+            var filePath = Path.Combine(dir, "logging.json");
+            File.WriteAllText(filePath, content);
+        }
+    }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.Extend.cs
index b5c933d..be8188d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.Extend.cs
@@ -12,6 +12,8 @@ public loggingDevelopment(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.Extend.cs
index 188c88b..44e4e4e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.Extend.cs
@@ -12,6 +12,8 @@ public module(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.Extend.cs
index dda279b..d16a142 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.Extend.cs
@@ -12,6 +12,8 @@ public moduleDevelopment(TemplateBuildModel model)
             _model = model;
         }
 
+        public bool IsGlobal => true;
+
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
diff --git a/src/Library/Infrastructure/Templates/ITemplateHandler.cs b/src/Library/Infrastructure/Templates/ITemplateHandler.cs
index c9449e7..61ae888 100644
--- a/src/Library/Infrastructure/Templates/ITemplateHandler.cs
+++ b/src/Library/Infrastructure/Templates/ITemplateHandler.cs
@@ -5,6 +5,11 @@
     /// </summary>
     public interface ITemplateHandler
     {
+        /// <summary>
+        /// 是否是全局文件
+        /// </summary>
+        bool IsGlobal { get; }
+
         /// <summary>
         /// 保存
         /// </summary>
diff --git a/src/Library/Infrastructure/Templates/Models/TemplateBuildModel.cs b/src/Library/Infrastructure/Templates/Models/TemplateBuildModel.cs
index 9af63f1..8ed90e1 100644
--- a/src/Library/Infrastructure/Templates/Models/TemplateBuildModel.cs
+++ b/src/Library/Infrastructure/Templates/Models/TemplateBuildModel.cs
@@ -5,6 +5,11 @@
     /// </summary>
     public class TemplateBuildModel
     {
+        /// <summary>
+        /// 生成整个解决方案
+        /// </summary>
+        public bool GenerateSln { get; set; }
+
         /// <summary>
         /// 代码存储根路径
         /// </summary>
diff --git a/src/Library/Infrastructure/Templates/TemplateBuilderAbstract.cs b/src/Library/Infrastructure/Templates/TemplateBuilderAbstract.cs
index 47ee115..4d93420 100644
--- a/src/Library/Infrastructure/Templates/TemplateBuilderAbstract.cs
+++ b/src/Library/Infrastructure/Templates/TemplateBuilderAbstract.cs
@@ -30,7 +30,8 @@ public virtual void Build(TemplateBuildModel model)
             foreach (var type in handlerTypeList)
             {
                 var instance = (ITemplateHandler)Activator.CreateInstance(type, model);
-                instance.Save();
+                if (model.GenerateSln || !instance.IsGlobal)
+                    instance.Save();
             }
         }
     }
diff --git a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
index 1136531..c9275f4 100644
--- a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
+++ b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.8"}
+{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.9"}
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index cccf14f..dedcebd 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netmodular-module-code-generator",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "author": "Oldli",
   "license": "ISC",
   "code": "codeGenerator",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "netmodular-module-admin": "^1.1.5",
-    "netmodular-ui": "^1.4.0"
+    "netmodular-ui": "^1.4.3"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.1.2",
@@ -35,7 +35,7 @@
     "prettier": "^1.18.2",
     "raw-loader": "^3.1.0",
     "rimraf": "^3.0.0",
-    "sass": "^1.24.4",
+    "sass": "^1.25.0",
     "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/src/UI/module-code-generator/src/index.js b/src/UI/module-code-generator/src/index.js
index 9dcf4b3..a239d27 100644
--- a/src/UI/module-code-generator/src/index.js
+++ b/src/UI/module-code-generator/src/index.js
@@ -1,5 +1,5 @@
-import store from './store'
 import './api'
+import store from './store'
 import routes from './routes'
 import components from './components'
 import module from './module'
diff --git a/src/UI/module-code-generator/src/views/class/index/index.vue b/src/UI/module-code-generator/src/views/class/index/index.vue
index 7a59f17..68f3ca0 100644
--- a/src/UI/module-code-generator/src/views/class/index/index.vue
+++ b/src/UI/module-code-generator/src/views/class/index/index.vue
@@ -1,6 +1,6 @@
 <template>
   <nm-list-dialog v-bind="dialogOptions" :visible.sync="visible_" @open="onOpen">
-    <nm-list ref="list" v-bind="list">
+    <nm-list ref="list" v-bind="list" @reset="onReset">
       <template v-slot:querybar>
         <el-form-item label="名称：" prop="name">
           <el-input v-model="list.model.name" clearable />
@@ -12,11 +12,11 @@
       </template>
 
       <template v-slot:col-operation="{ row }">
-        <nm-button text="编辑" icon="edit" type="text" @click="edit(row)" />
-        <nm-button text="属性" icon="entity" type="text" @click="manageProperty(row)" />
+        <nm-button text="属性管理" icon="entity" type="text" @click="manageProperty(row)" />
         <nm-button text="视图模型" icon="entity" type="text" @click="openModelManage(row)" />
         <nm-button text="生成代码" icon="download" type="text" @click="buildCode(row)" />
         <!-- <nm-button text="预览代码" icon="display" type="text" @click="codePreview(row)" /> -->
+        <nm-button text="编辑" icon="edit" type="text" @click="edit(row)" />
         <nm-button-delete :action="removeAction" :id="row.id" @success="refresh" />
       </template>
     </nm-list>
@@ -70,7 +70,7 @@ export default {
   computed: {
     dialogOptions() {
       return {
-        title: `类列表(${this.project.name})`,
+        title: `实体列表(${this.project.name})`,
         icon: 'list',
         width: '80%'
       }
@@ -104,9 +104,12 @@ export default {
     onOpen() {
       this.$nextTick(() => {
         this.$refs.list.reset()
-        this.list.model.projectId = this.project.id
-        this.$refs.list.query()
       })
+    },
+    onReset() {
+      console.log(1)
+      this.list.model.projectId = this.project.id
+      this.$refs.list.query()
     }
   }
 }
diff --git a/src/UI/module-code-generator/src/views/modelProperty/components/list/index.vue b/src/UI/module-code-generator/src/views/modelProperty/components/list/index.vue
index c6234df..dcebb5b 100644
--- a/src/UI/module-code-generator/src/views/modelProperty/components/list/index.vue
+++ b/src/UI/module-code-generator/src/views/modelProperty/components/list/index.vue
@@ -48,7 +48,7 @@ export default {
       list: {
         noHeader: true,
         queryOnCreated: false,
-        noSearch: true,
+        noResetBtn: true,
         action: api.query,
         operationWidth: 150,
         model: {
diff --git a/src/UI/module-code-generator/src/views/modelProperty/index/index.vue b/src/UI/module-code-generator/src/views/modelProperty/index/index.vue
index 488d810..ed6d799 100644
--- a/src/UI/module-code-generator/src/views/modelProperty/index/index.vue
+++ b/src/UI/module-code-generator/src/views/modelProperty/index/index.vue
@@ -17,7 +17,7 @@
       </el-tabs>
     </div>
     <div class="bottom">
-      <list-page ref="list" :parent="parent" :model-type="modelType" />
+      <list-page ref="list" :parent="parent" :model-type="modelType" @reset="onReset" />
     </div>
   </nm-dialog>
 </template>
@@ -59,8 +59,10 @@ export default {
       this.$nextTick(() => {
         this.active = 'query'
         this.$refs.list.reset()
-        this.$refs.list.refresh()
       })
+    },
+    onReset() {
+      this.$refs.list.refresh()
     }
   }
 }
diff --git a/src/UI/module-code-generator/src/views/project/components/save/index.vue b/src/UI/module-code-generator/src/views/project/components/save/index.vue
index c8b35e9..aa12a7b 100644
--- a/src/UI/module-code-generator/src/views/project/components/save/index.vue
+++ b/src/UI/module-code-generator/src/views/project/components/save/index.vue
@@ -28,7 +28,7 @@ export default {
   mixins: [mixins.formSave],
   data() {
     return {
-      title: '项目',
+      title: '模块',
       actions: { add, edit, update },
       form: {
         width: '30%',
@@ -42,6 +42,10 @@ export default {
         rules: {
           name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
           code: [{ required: true, message: '请输入编码', trigger: 'blur' }],
+          no: [
+            { required: true, message: '请输入编号', trigger: 'blur' },
+            { type: 'number', min: 0, max: 59315, message: '编码在 0 到 59315 之间', trigger: 'blur' }
+          ],
           copyright: [{ required: true, message: '请输入版权声明', trigger: 'blur' }]
         }
       }
diff --git a/src/UI/module-code-generator/src/views/project/index/index.vue b/src/UI/module-code-generator/src/views/project/index/index.vue
index 1158d68..0350e39 100644
--- a/src/UI/module-code-generator/src/views/project/index/index.vue
+++ b/src/UI/module-code-generator/src/views/project/index/index.vue
@@ -21,9 +21,9 @@
 
       <!--操作列-->
       <template v-slot:col-operation="{ row }">
-        <nm-button v-bind="buttons.edit" @click="edit(row)" />
-        <nm-button text="实体" icon="entity" type="text" @click="manageClass(row)" />
+        <nm-button v-bind="buttons.classManage" @click="manageClass(row)" />
         <nm-button v-bind="buttons.buildCode" @click="buildCode(row)" />
+        <nm-button v-bind="buttons.edit" @click="edit(row)" />
         <nm-button-delete v-bind="buttons.del" :action="removeAction" :id="row.id" @success="refresh" />
       </template>
     </nm-list>
diff --git a/src/UI/module-code-generator/src/views/project/index/page.js b/src/UI/module-code-generator/src/views/project/index/page.js
index 3f2d59d..b061247 100644
--- a/src/UI/module-code-generator/src/views/project/index/page.js
+++ b/src/UI/module-code-generator/src/views/project/index/page.js
@@ -1,6 +1,6 @@
 /** 页面信息 */
 const page = new (function() {
-  this.title = '项目列表'
+  this.title = '模块列表'
   this.icon = 'project'
   this.name = 'codegenerator_project'
   this.path = '/codegenerator/project'
@@ -32,11 +32,18 @@ const page = new (function() {
       permissions: [`${this.name}_delete_delete`]
     },
     buildCode: {
-      text: '生成',
+      text: '生成代码',
       type: 'text',
       icon: 'download',
       code: `${this.name}_build_code`,
       permissions: [`${this.name}_buildcode_post`]
+    },
+    classManage: {
+      text: '实体管理',
+      type: 'text',
+      icon: 'database',
+      code: `${this.name}_class_manage`,
+      permissions: []
     }
   }
 })()
diff --git a/src/UI/module-code-generator/src/views/property/index/index.vue b/src/UI/module-code-generator/src/views/property/index/index.vue
index 2fec3ba..8528a29 100644
--- a/src/UI/module-code-generator/src/views/property/index/index.vue
+++ b/src/UI/module-code-generator/src/views/property/index/index.vue
@@ -1,6 +1,6 @@
 <template>
   <nm-list-dialog class="nm-module-code-generator-property" :title="`属性列表(${parent.name})`" icon="list" width="70%" :visible.sync="visible_" @open="onOpen">
-    <nm-list ref="list" v-bind="list">
+    <nm-list ref="list" v-bind="list" @reset="onReset">
       <template v-slot:querybar>
         <el-form-item label="名称：" prop="name">
           <el-input v-model="list.model.name" clearable />
@@ -121,9 +121,11 @@ export default {
     onOpen() {
       this.$nextTick(() => {
         this.$refs.list.reset()
-        this.list.model.classId = this.parent.id
-        this.$refs.list.query()
       })
+    },
+    onReset() {
+      this.list.model.classId = this.parent.id
+      this.$refs.list.query()
     }
   }
 }
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 07a4807..fcfb948 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.4" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.5.4" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.6.2" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.5.1" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.6" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.5.5" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.6.5" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.5.2" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 6843141..41bc059 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -5,13 +5,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.5.3" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.6.6" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.6.6" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.6.6" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.5.0" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.5.9" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.6.3" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.5.4" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.6.7" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.6.7" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.6.7" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.5.1" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.6.0" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.6.6" />
   </ItemGroup>
 
   <ItemGroup>

From 9f24c9229c200c336e7b6f66a8c81a58b9ef88c8 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Sun, 9 Feb 2020 00:04:19 +0800
Subject: [PATCH 20/71] update

---
 build/module.build.targets                    |  15 +-
 data/SQLite/Nm_Admin.db                       | Bin 151552 -> 167936 bytes
 data/SQLite/Nm_CodeGenerator.db               | Bin 86016 -> 61440 bytes
 src/Directory.Build.props                     |   7 +-
 src/Library/Application/Application.csproj    |   4 +-
 .../Application/ClassService/ClassService.cs  |  14 +-
 .../Application/ClassService/IClassService.cs |   4 +-
 .../ClassService/ViewModels/ClassAddModel.cs  |   7 +-
 .../ViewModels/ClassUpdateModel.cs            |   5 +
 .../ModelPropertyService.cs                   |   2 +-
 .../IModuleService.cs}                        |  20 +-
 .../ModuleService.cs}                         |  87 ++---
 .../ModuleBuildCodeResultModel.cs}            |   4 +-
 .../ViewModels/ModuleAddModel.cs}             |  16 +-
 .../ViewModels/ModuleBuildCodeModel.cs}       |   4 +-
 .../ViewModels/ModuleUpdateModel.cs}          |   4 +-
 .../_MapperConfig.cs                          |  14 +-
 .../PropertyService/PropertyService.cs        |   2 +-
 src/Library/Domain/Class/ClassEntity.cs       |   9 +-
 src/Library/Domain/Class/IClassRepository.cs  |  12 +-
 .../Domain/Class/Models/ClassQueryModel.cs    |   6 +-
 src/Library/Domain/Domain.csproj              |   6 +-
 .../ModelProperty/IModelPropertyRepository.cs |   6 +-
 .../ModelProperty/ModelPropertyEntity.cs      |   4 +-
 .../IModuleRepository.cs}                     |   8 +-
 .../Models/ModuleQueryModel.cs}               |   4 +-
 .../Domain/Module/ModuleEntity.Extend.cs      |   7 +
 .../ModuleEntity.cs}                          |  14 +-
 .../Domain/Project/ProjectEntity.Extend.cs    |   7 -
 .../Domain/Property/IPropertyRepository.cs    |   6 +-
 src/Library/Domain/Property/PropertyEntity.cs |   4 +-
 .../BaseEntityPropertyCollection.cs           |   8 +-
 .../Infrastructure/CodeGeneratorOptions.cs    |  47 +++
 .../Infrastructure/Infrastructure.csproj      |  70 ++--
 .../Options/CodeGeneratorOptions.cs           |  27 --
 .../Options/ModuleOptionsConfigure.cs         |  14 -
 ...ojectRepository.cs => ModuleRepository.cs} |   4 +-
 ...ojectRepository.cs => ModuleRepository.cs} |   4 +-
 .../Repositories/SqlServer/ClassRepository.cs |  12 +-
 .../SqlServer/ModelPropertyRepository.cs      |   4 +-
 ...ojectRepository.cs => ModuleRepository.cs} |  10 +-
 .../SqlServer/PropertyRepository.cs           |   4 +-
 .../Templates/Default/T4/Readme.cs            |   2 +-
 .../Templates/Default/T4/Readme.tt            |   2 +-
 .../Templates/Default/T4/Solution.Extend.cs   |   2 +-
 .../Default/T4/build/ModuleBuildTargets.cs    |  15 +-
 .../Default/T4/build/ModuleBuildTargets.tt    |  13 +-
 .../Templates/Default/T4/script/NpmInstall.cs |   2 +-
 .../Templates/Default/T4/script/NpmInstall.tt |   2 +-
 .../Templates/Default/T4/script/NpmPublish.cs |   2 +-
 .../Templates/Default/T4/script/NpmPublish.tt |   2 +-
 .../Templates/Default/T4/script/NpmUpdate.cs  |   2 +-
 .../Templates/Default/T4/script/NpmUpdate.tt  |   2 +-
 .../T4/src/DirectoryBuildProps.Extend.cs      |   2 +-
 .../Default/T4/src/DirectoryBuildProps.cs     |  35 +-
 .../Default/T4/src/DirectoryBuildProps.tt     |   9 +-
 .../src/Library/Application/Csproj.Extend.cs  |   2 +-
 .../T4/src/Library/Application/Csproj.cs      |   4 +-
 .../T4/src/Library/Application/Csproj.tt      |   4 +-
 .../Application/MapperConfig.Extend.cs        |   6 +-
 .../src/Library/Application/MapperConfig.cs   |   6 +-
 .../src/Library/Application/MapperConfig.tt   |   6 +-
 .../Library/Application/ServiceImpl.Extend.cs |   6 +-
 .../T4/src/Library/Application/ServiceImpl.cs |   8 +-
 .../T4/src/Library/Application/ServiceImpl.tt |   8 +-
 .../Application/ServiceInterface.Extend.cs    |   6 +-
 .../Library/Application/ServiceInterface.cs   |   6 +-
 .../Library/Application/ServiceInterface.tt   |   6 +-
 .../Application/ViewModels/AddModel.Extend.cs |   6 +-
 .../Application/ViewModels/AddModel.cs        |   4 +-
 .../Application/ViewModels/AddModel.tt        |   4 +-
 .../ViewModels/UpdateModel.Extend.cs          |   6 +-
 .../Application/ViewModels/UpdateModel.cs     |  70 ++--
 .../Application/ViewModels/UpdateModel.tt     |  15 +-
 .../T4/src/Library/Domain/Csproj.Extend.cs    |   2 +-
 .../Default/T4/src/Library/Domain/Csproj.cs   |   6 +-
 .../Default/T4/src/Library/Domain/Csproj.tt   |   6 +-
 .../T4/src/Library/Domain/Entity.Extend.cs    |   6 +-
 .../Default/T4/src/Library/Domain/Entity.cs   |   2 +-
 .../Default/T4/src/Library/Domain/Entity.tt   |   2 +-
 .../src/Library/Domain/EntityEnum.Extend.cs   |   2 +-
 .../T4/src/Library/Domain/EntityEnum.cs       |   2 +-
 .../T4/src/Library/Domain/EntityEnum.tt       |   2 +-
 .../src/Library/Domain/EntityExtend.Extend.cs |   6 +-
 .../T4/src/Library/Domain/EntityExtend.cs     |   2 +-
 .../T4/src/Library/Domain/EntityExtend.tt     |   2 +-
 .../Domain/Models/QueryModel.Extend.cs        |   6 +-
 .../src/Library/Domain/Models/QueryModel.cs   |   2 +-
 .../src/Library/Domain/Models/QueryModel.tt   |   2 +-
 .../src/Library/Domain/Repository.Extend.cs   |   6 +-
 .../T4/src/Library/Domain/Repository.cs       |   4 +-
 .../T4/src/Library/Domain/Repository.tt       |   4 +-
 .../Library/Infrastructure/Csproj.Extend.cs   |   2 +-
 .../T4/src/Library/Infrastructure/Csproj.cs   |  34 +-
 .../T4/src/Library/Infrastructure/Csproj.tt   |  13 +-
 .../{Options => }/Options.Extend.cs           |   8 +-
 .../Infrastructure/{Options => }/Options.cs   |  24 +-
 .../T4/src/Library/Infrastructure/Options.tt  |  13 +
 .../Options/ModuleOptionsConfigure.Extend.cs  |  30 --
 .../Options/ModuleOptionsConfigure.cs         | 338 ------------------
 .../Options/ModuleOptionsConfigure.tt         |  15 -
 .../Library/Infrastructure/Options/Options.tt |  13 -
 .../Repositories/DbContext.Extend.cs          |   4 +-
 .../Infrastructure/Repositories/DbContext.cs  |   6 +-
 .../Infrastructure/Repositories/DbContext.tt  |   6 +-
 .../Repositories/MySqlRepository.Extend.cs    |   6 +-
 .../Repositories/MySqlRepository.cs           |   2 +-
 .../Repositories/MySqlRepository.tt           |   2 +-
 .../PostgreSQLRepository.Extend.cs            |   6 +-
 .../Repositories/PostgreSQLRepository.cs      |   2 +-
 .../Repositories/PostgreSQLRepository.tt      |   2 +-
 .../Repositories/SQLiteRepository.Extend.cs   |   6 +-
 .../Repositories/SQLiteRepository.cs          |   2 +-
 .../Repositories/SQLiteRepository.tt          |   2 +-
 .../SqlServerRepository.Extend.cs             |   6 +-
 .../Repositories/SqlServerRepository.cs       |   6 +-
 .../Repositories/SqlServerRepository.tt       |   6 +-
 .../T4/src/UI/App/BabelConfig.Extend.cs       |   2 +-
 .../T4/src/UI/App/Browserslistrc.Extend.cs    |   2 +-
 .../Default/T4/src/UI/App/Browserslistrc.cs   |   2 +-
 .../Default/T4/src/UI/App/Browserslistrc.tt   |   3 +-
 .../Default/T4/src/UI/App/Eslintrc.Extend.cs  |   2 +-
 .../Default/T4/src/UI/App/Package.Extend.cs   |   4 +-
 .../Default/T4/src/UI/App/Package.cs          |  28 +-
 .../Default/T4/src/UI/App/Package.tt          |  28 +-
 .../T4/src/UI/App/PostcssConfig.Extend.cs     |   2 +-
 .../T4/src/UI/App/Prettierrc.Extend.cs        |   2 +-
 .../Default/T4/src/UI/App/VueConfig.Extend.cs |   4 +-
 .../Default/T4/src/UI/App/VueConfig.cs        |  25 +-
 .../Default/T4/src/UI/App/VueConfig.tt        |   9 +-
 .../Default/T4/src/UI/App/src/Index.Extend.cs |   2 +-
 .../Default/T4/src/UI/App/src/Main.Extend.cs  |   4 +-
 .../Default/T4/src/UI/App/src/Main.cs         |   4 +-
 .../Default/T4/src/UI/App/src/Main.tt         |   4 +-
 .../T4/src/UI/App/src/Module.Extend.cs        |   2 +-
 .../T4/src/UI/App/src/api/Index.Extend.cs     |   2 +-
 .../App/src/api/components/Entity.Extend.cs   |   6 +-
 .../App/src/components/Components.Extend.cs   |   6 +-
 .../T4/src/UI/App/src/config/Config.Extend.cs |   2 +-
 .../T4/src/UI/App/src/config/Config.cs        |   2 +-
 .../T4/src/UI/App/src/routes/Routes.Extend.cs |   4 +-
 .../T4/src/UI/App/src/store/Store.Extend.cs   |   2 +-
 .../src/views/components/SavePage.Extend.cs   |  10 +-
 .../UI/App/src/views/components/SavePage.cs   |   6 +-
 .../UI/App/src/views/components/SavePage.tt   |   6 +-
 .../src/UI/App/src/views/index/Cols.Extend.cs |   6 +-
 .../UI/App/src/views/index/Index.Extend.cs    |   8 +-
 .../T4/src/UI/App/src/views/index/Index.cs    |  10 +-
 .../T4/src/UI/App/src/views/index/Index.tt    |  14 +-
 .../src/UI/App/src/views/index/Page.Extend.cs |   6 +-
 .../T4/src/UI/App/src/views/index/Page.cs     |  25 +-
 .../T4/src/UI/App/src/views/index/Page.tt     |   7 +-
 .../T4/src/UI/App/vscode/settings.Extend.cs   |   2 +-
 .../src/Web/Controllers/Controller.Extend.cs  |   6 +-
 .../T4/src/Web/Controllers/Controller.cs      |  70 ++--
 .../T4/src/Web/Controllers/Controller.tt      |   8 +-
 .../Default/T4/src/Web/Csproj.Extend.cs       |   2 +-
 .../Templates/Default/T4/src/Web/Csproj.cs    |  40 ++-
 .../Templates/Default/T4/src/Web/Csproj.tt    |  19 +-
 .../T4/src/Web/ModuleController.Extend.cs     |   2 +-
 .../Default/T4/src/Web/ModuleController.cs    |   4 +-
 .../Default/T4/src/Web/ModuleController.tt    |   4 +-
 .../T4/src/Web/ModuleInitializer.Extend.cs    |   2 +-
 .../Default/T4/src/Web/ModuleInitializer.cs   |  23 +-
 .../Default/T4/src/Web/ModuleInitializer.tt   |  15 +-
 .../Default/T4/src/WebHost/Csproj.Extend.cs   |   2 +-
 .../Default/T4/src/WebHost/Csproj.cs          |  62 ++--
 .../Default/T4/src/WebHost/Csproj.tt          |  31 +-
 .../Default/T4/src/WebHost/Program.Extend.cs  |   2 +-
 .../Default/T4/src/WebHost/Program.cs         |   2 +-
 .../Default/T4/src/WebHost/Program.tt         |   2 +-
 .../Default/T4/src/WebHost/Startup.Extend.cs  |   2 +-
 .../Default/T4/src/WebHost/Startup.cs         |   2 +-
 .../Default/T4/src/WebHost/Startup.tt         |   2 +-
 .../T4/src/WebHost/config/cache.Extend.cs     |   2 +-
 .../WebHost/config/cacheDevelopment.Extend.cs |   2 +-
 .../T4/src/WebHost/config/db.Extend.cs        |   2 +-
 .../Default/T4/src/WebHost/config/db.cs       |  16 +-
 .../Default/T4/src/WebHost/config/db.tt       |   6 +-
 .../Default/T4/src/WebHost/config/host.cs     |   2 +-
 .../Default/T4/src/WebHost/config/host.tt     |   2 +-
 .../Default/T4/src/WebHost/config/jwt.cs      |   8 +-
 .../Default/T4/src/WebHost/config/jwt.tt      |   4 +-
 .../src/WebHost/config/loggingDevelopment.cs  |   2 +-
 .../T4/src/WebHost/config/module.Extend.cs    |  28 --
 .../Default/T4/src/WebHost/config/module.cs   | 309 ----------------
 .../Default/T4/src/WebHost/config/module.tt   |  14 -
 .../config/moduleDevelopment.Extend.cs        |  28 --
 .../src/WebHost/config/moduleDevelopment.cs   | 307 ----------------
 .../src/WebHost/config/moduleDevelopment.tt   |   4 -
 .../Templates/Models/ClassBuildModel.cs       |   5 +
 ...ojectBuildModel.cs => ModuleBuildModel.cs} |  11 +-
 .../Templates/Models/TemplateBuildModel.cs    |   4 +-
 src/UI/module-code-generator/package.json     |  18 +-
 .../api/components/{project.js => module.js}  |   0
 .../src/views/class/components/save/index.vue |  16 +-
 .../src/views/class/index/cols.js             |   4 +
 .../src/views/class/index/index.vue           |  14 +-
 .../components/save/index.vue                 |   7 +-
 .../components/select/index.vue               |   2 +-
 .../views/{project => module}/index/cols.js   |   4 +
 .../views/{project => module}/index/index.vue |   8 +-
 .../views/{project => module}/index/page.js   |   8 +-
 src/Web/Controllers/ClassController.cs        |  19 +-
 src/Web/Controllers/EnumController.cs         |   2 +-
 src/Web/Controllers/EnumItemController.cs     |   2 +-
 .../Controllers/ModelPropertyController.cs    |   2 +-
 ...ojectController.cs => ModuleController.cs} |  36 +-
 src/Web/Controllers/PropertyController.cs     |   2 +-
 src/Web/ModuleInitializer.cs                  |  13 -
 src/Web/Web.csproj                            |  19 +-
 src/WebHost/WebHost.csproj                    |  30 +-
 .../_modules/CodeGenerator/_module.json       |   1 +
 src/WebHost/config/db.json                    |   2 +
 src/WebHost/config/module.Development.json    |   3 -
 src/WebHost/config/module.json                |  20 --
 216 files changed, 964 insertions(+), 1968 deletions(-)
 rename src/Library/Application/{ProjectService/IProjectService.cs => ModuleService/IModuleService.cs} (65%)
 rename src/Library/Application/{ProjectService/ProjectService.cs => ModuleService/ModuleService.cs} (71%)
 rename src/Library/Application/{ProjectService/ResultModels/ProjectBuildCodeResultModel.cs => ModuleService/ResultModels/ModuleBuildCodeResultModel.cs} (57%)
 rename src/Library/Application/{ProjectService/ViewModels/ProjectAddModel.cs => ModuleService/ViewModels/ModuleAddModel.cs} (60%)
 rename src/Library/Application/{ProjectService/ViewModels/ProjectBuildCodeModel.cs => ModuleService/ViewModels/ModuleBuildCodeModel.cs} (71%)
 rename src/Library/Application/{ProjectService/ViewModels/ProjectUpdateModel.cs => ModuleService/ViewModels/ModuleUpdateModel.cs} (68%)
 rename src/Library/Application/{ProjectService => ModuleService}/_MapperConfig.cs (59%)
 rename src/Library/Domain/{Project/IProjectRepository.cs => Module/IModuleRepository.cs} (55%)
 rename src/Library/Domain/{Project/Models/ProjectQueryModel.cs => Module/Models/ModuleQueryModel.cs} (70%)
 create mode 100644 src/Library/Domain/Module/ModuleEntity.Extend.cs
 rename src/Library/Domain/{Project/ProjectEntity.cs => Module/ModuleEntity.cs} (69%)
 delete mode 100644 src/Library/Domain/Project/ProjectEntity.Extend.cs
 create mode 100644 src/Library/Infrastructure/CodeGeneratorOptions.cs
 delete mode 100644 src/Library/Infrastructure/Options/CodeGeneratorOptions.cs
 delete mode 100644 src/Library/Infrastructure/Options/ModuleOptionsConfigure.cs
 rename src/Library/Infrastructure/Repositories/MySql/{ProjectRepository.cs => ModuleRepository.cs} (53%)
 rename src/Library/Infrastructure/Repositories/SQLite/{ProjectRepository.cs => ModuleRepository.cs} (53%)
 rename src/Library/Infrastructure/Repositories/SqlServer/{ProjectRepository.cs => ModuleRepository.cs} (74%)
 rename src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/{Options => }/Options.Extend.cs (78%)
 rename src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/{Options => }/Options.cs (90%)
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.tt
 rename src/Library/Infrastructure/Templates/Models/{ProjectBuildModel.cs => ModuleBuildModel.cs} (83%)
 rename src/UI/module-code-generator/src/api/components/{project.js => module.js} (100%)
 rename src/UI/module-code-generator/src/views/{project => module}/components/save/index.vue (85%)
 rename src/UI/module-code-generator/src/views/{project => module}/components/select/index.vue (74%)
 rename src/UI/module-code-generator/src/views/{project => module}/index/cols.js (90%)
 rename src/UI/module-code-generator/src/views/{project => module}/index/index.vue (91%)
 rename src/UI/module-code-generator/src/views/{project => module}/index/page.js (85%)
 rename src/Web/Controllers/{ProjectController.cs => ModuleController.cs} (52%)
 create mode 100644 src/WebHost/_modules/CodeGenerator/_module.json
 delete mode 100644 src/WebHost/config/module.Development.json
 delete mode 100644 src/WebHost/config/module.json

diff --git a/build/module.build.targets b/build/module.build.targets
index 5068c63..6218c98 100644
--- a/build/module.build.targets
+++ b/build/module.build.targets
@@ -3,19 +3,10 @@
   <PropertyGroup>
     <ModulesDir>_modules\$(Id)</ModulesDir>
     <ModuleName>$(ModulesDir)\_module.json</ModuleName>
-    <ModuleInfo>{"Id": "$(Id)","Name":"$(Name)","Version":"$(Version)"}</ModuleInfo>
+    <ModuleInfo>{"Id": "$(Id)","Name":"$(Name)","Icon":"$(Icon)","Version":"$(Version)"}</ModuleInfo>
   </PropertyGroup>
 
-  <!--嵌入module.json文件-->
-  <ItemGroup Condition="Exists('$(ModuleName)')">
-    <Content Remove="$(ModuleName)" />
-  </ItemGroup>
-
-  <ItemGroup Condition="Exists('$(ModuleName)')">
-    <EmbeddedResource Include="$(ModuleName)"  Watch="false"/>
-  </ItemGroup>
-
-  <Target Name="ModulesBuildBefore" AfterTargets="Build">
+  <Target Name="ModulesBuild" AfterTargets="Build">
 
     <!--创建modules目录-->
     <MakeDir Directories="$(ModulesDir)"/>
@@ -25,4 +16,4 @@
 
   </Target>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index d4ea93f04c0f30d8f5bef75ecfec664177bc8f1c..739a82d0cfbd95ac4e26193fac65206836ed9e52 100644
GIT binary patch
literal 167936
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

literal 151552
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

diff --git a/data/SQLite/Nm_CodeGenerator.db b/data/SQLite/Nm_CodeGenerator.db
index 130f35ee1c70f01716af2a70abe63111ec26ef31..71d5c2e4f755f3f76d68995466d2b56cd80059e5 100644
GIT binary patch
literal 61440
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
U0uX=z1R(H#5E$(LkG@0k4M$LZ(EtDd

literal 86016
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
I-AGUO&kT`o;{X5v

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 8af4eba..bf90f03 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,9 +1,10 @@
 <Project>
   <PropertyGroup>
     <Id>CodeGenerator</Id>
-    <Name>代码生成器</Name>
+    <Name>代码生成</Name>
+    <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.5.9</Version>
+    <Version>1.6.0</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
@@ -16,7 +17,7 @@
     <PackageOutputPath>$(SolutionDir)\_packages</PackageOutputPath>
     <Company>Oldli</Company>
     <Copyright>Oldli</Copyright>
-    <PackageProjectUrl>https://nm.iamoldli.com/docs/</PackageProjectUrl>
+    <PackageProjectUrl>https://docs.17mkh.com/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/iamoldli/NetModular.Module.CodeGenerator</RepositoryUrl>
   </PropertyGroup>
 </Project>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index f6530d2..7239316 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.6.7" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.5.1" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.7.0" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.7.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Application/ClassService/ClassService.cs b/src/Library/Application/ClassService/ClassService.cs
index ae9cc51..fdbbc55 100644
--- a/src/Library/Application/ClassService/ClassService.cs
+++ b/src/Library/Application/ClassService/ClassService.cs
@@ -4,8 +4,8 @@
 using AutoMapper;
 using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.ClassService.ViewModels;
-using NetModular.Module.CodeGenerator.Application.ProjectService;
-using NetModular.Module.CodeGenerator.Application.ProjectService.ResultModels;
+using NetModular.Module.CodeGenerator.Application.ModuleService;
+using NetModular.Module.CodeGenerator.Application.ModuleService.ResultModels;
 using NetModular.Module.CodeGenerator.Domain.Class;
 using NetModular.Module.CodeGenerator.Domain.Class.Models;
 using NetModular.Module.CodeGenerator.Domain.ClassMethod;
@@ -23,10 +23,10 @@ public class ClassService : IClassService
         private readonly BaseEntityPropertyCollection _baseEntityPropertyCollection;
         private readonly IClassMethodRepository _classMethodRepository;
 
-        private readonly IProjectService _projectService;
+        private readonly IModuleService _projectService;
         private readonly CodeGeneratorDbContext _dbContext;
 
-        public ClassService(IMapper mapper, IClassRepository repository, BaseEntityPropertyCollection baseEntityPropertyCollection, IPropertyRepository propertyRepository, IClassMethodRepository classMethodRepository, IProjectService projectService, CodeGeneratorDbContext dbContext)
+        public ClassService(IMapper mapper, IClassRepository repository, BaseEntityPropertyCollection baseEntityPropertyCollection, IPropertyRepository propertyRepository, IClassMethodRepository classMethodRepository, IModuleService projectService, CodeGeneratorDbContext dbContext)
         {
             _mapper = mapper;
             _repository = repository;
@@ -156,14 +156,14 @@ public async Task<IResultModel> Update(ClassUpdateModel model)
             return ResultModel.Failed();
         }
 
-        public async Task<IResultModel<ProjectBuildCodeResultModel>> BuildCode(Guid id)
+        public async Task<IResultModel<ModuleBuildCodeResultModel>> BuildCode(Guid id)
         {
-            var result = new ResultModel<ProjectBuildCodeResultModel>();
+            var result = new ResultModel<ModuleBuildCodeResultModel>();
             var entity = await _repository.GetAsync(id);
             if (entity == null)
                 return result.Failed("对象不存在");
 
-            return await _projectService.BuildCode(entity.ProjectId, new List<ClassEntity> { entity });
+            return await _projectService.BuildCode(entity.ModuleId, new List<ClassEntity> { entity });
         }
     }
 }
diff --git a/src/Library/Application/ClassService/IClassService.cs b/src/Library/Application/ClassService/IClassService.cs
index 9487f50..f33d1f6 100644
--- a/src/Library/Application/ClassService/IClassService.cs
+++ b/src/Library/Application/ClassService/IClassService.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.ClassService.ViewModels;
-using NetModular.Module.CodeGenerator.Application.ProjectService.ResultModels;
+using NetModular.Module.CodeGenerator.Application.ModuleService.ResultModels;
 using NetModular.Module.CodeGenerator.Domain.Class.Models;
 
 namespace NetModular.Module.CodeGenerator.Application.ClassService
@@ -52,6 +52,6 @@ public interface IClassService
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        Task<IResultModel<ProjectBuildCodeResultModel>> BuildCode(Guid id);
+        Task<IResultModel<ModuleBuildCodeResultModel>> BuildCode(Guid id);
     }
 }
\ No newline at end of file
diff --git a/src/Library/Application/ClassService/ViewModels/ClassAddModel.cs b/src/Library/Application/ClassService/ViewModels/ClassAddModel.cs
index 4d3db4e..871bdb8 100644
--- a/src/Library/Application/ClassService/ViewModels/ClassAddModel.cs
+++ b/src/Library/Application/ClassService/ViewModels/ClassAddModel.cs
@@ -9,7 +9,7 @@ public class ClassAddModel
         /// <summary>
         /// 项目编号
         /// </summary>
-        public Guid ProjectId { get; set; }
+        public Guid ModuleId { get; set; }
 
         /// <summary>
         /// 类名称
@@ -34,6 +34,11 @@ public class ClassAddModel
         [Required(ErrorMessage = "请输入类名")]
         public string Remarks { get; set; }
 
+        /// <summary>
+        /// 菜单图标
+        /// </summary>
+        public string MenuIcon { get; set; }
+
         /// <summary>
         /// 方法
         /// </summary>
diff --git a/src/Library/Application/ClassService/ViewModels/ClassUpdateModel.cs b/src/Library/Application/ClassService/ViewModels/ClassUpdateModel.cs
index 6d0045c..5e790f1 100644
--- a/src/Library/Application/ClassService/ViewModels/ClassUpdateModel.cs
+++ b/src/Library/Application/ClassService/ViewModels/ClassUpdateModel.cs
@@ -28,6 +28,11 @@ public class ClassUpdateModel
         [Required(ErrorMessage = "请输入类名")]
         public string Remarks { get; set; }
 
+        /// <summary>
+        /// 菜单图标
+        /// </summary>
+        public string MenuIcon { get; set; }
+
         /// <summary>
         /// 基类类型
         /// </summary>
diff --git a/src/Library/Application/ModelPropertyService/ModelPropertyService.cs b/src/Library/Application/ModelPropertyService/ModelPropertyService.cs
index aea7bcb..7c6cb85 100644
--- a/src/Library/Application/ModelPropertyService/ModelPropertyService.cs
+++ b/src/Library/Application/ModelPropertyService/ModelPropertyService.cs
@@ -48,7 +48,7 @@ public async Task<IResultModel> Add(ModelPropertyAddModel model)
                 return ResultModel.Failed("关联类不存在");
 
             var entity = _mapper.Map<ModelPropertyEntity>(model);
-            entity.ProjectId = classEntity.ProjectId;
+            entity.ModuleId = classEntity.ModuleId;
 
             if (await _repository.Exists(entity))
             {
diff --git a/src/Library/Application/ProjectService/IProjectService.cs b/src/Library/Application/ModuleService/IModuleService.cs
similarity index 65%
rename from src/Library/Application/ProjectService/IProjectService.cs
rename to src/Library/Application/ModuleService/IModuleService.cs
index 1a6e28a..2d06411 100644
--- a/src/Library/Application/ProjectService/IProjectService.cs
+++ b/src/Library/Application/ModuleService/IModuleService.cs
@@ -2,31 +2,31 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using NetModular.Lib.Utils.Core.Result;
-using NetModular.Module.CodeGenerator.Application.ProjectService.ResultModels;
-using NetModular.Module.CodeGenerator.Application.ProjectService.ViewModels;
+using NetModular.Module.CodeGenerator.Application.ModuleService.ResultModels;
+using NetModular.Module.CodeGenerator.Application.ModuleService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Class;
-using NetModular.Module.CodeGenerator.Domain.Project.Models;
+using NetModular.Module.CodeGenerator.Domain.Module.Models;
 
-namespace NetModular.Module.CodeGenerator.Application.ProjectService
+namespace NetModular.Module.CodeGenerator.Application.ModuleService
 {
     /// <summary>
     /// 项目服务
     /// </summary>
-    public interface IProjectService
+    public interface IModuleService
     {
         /// <summary>
         /// 查询
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        Task<IResultModel> Query(ProjectQueryModel model);
+        Task<IResultModel> Query(ModuleQueryModel model);
 
         /// <summary>
         /// 创建
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        Task<IResultModel> Add(ProjectAddModel model);
+        Task<IResultModel> Add(ModuleAddModel model);
 
         /// <summary>
         /// 删除
@@ -47,13 +47,13 @@ public interface IProjectService
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        Task<IResultModel> Update(ProjectUpdateModel model);
+        Task<IResultModel> Update(ModuleUpdateModel model);
 
         /// <summary>
         /// 生成代码,返回文件的Guid
         /// </summary>
         /// <returns></returns>
-        Task<IResultModel<ProjectBuildCodeResultModel>> BuildCode(ProjectBuildCodeModel model);
+        Task<IResultModel<ModuleBuildCodeResultModel>> BuildCode(ModuleBuildCodeModel model);
 
         /// <summary>
         /// 生成代码
@@ -61,6 +61,6 @@ public interface IProjectService
         /// <param name="projectId"></param>
         /// <param name="classList"></param>
         /// <returns></returns>
-        Task<IResultModel<ProjectBuildCodeResultModel>> BuildCode(Guid projectId, IList<ClassEntity> classList = null);
+        Task<IResultModel<ModuleBuildCodeResultModel>> BuildCode(Guid projectId, IList<ClassEntity> classList = null);
     }
 }
diff --git a/src/Library/Application/ProjectService/ProjectService.cs b/src/Library/Application/ModuleService/ModuleService.cs
similarity index 71%
rename from src/Library/Application/ProjectService/ProjectService.cs
rename to src/Library/Application/ModuleService/ModuleService.cs
index 30d1b96..992a407 100644
--- a/src/Library/Application/ProjectService/ProjectService.cs
+++ b/src/Library/Application/ModuleService/ModuleService.cs
@@ -5,33 +5,30 @@
 using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
-using Microsoft.Extensions.Options;
 using NetModular.Lib.Utils.Core.Extensions;
-using NetModular.Lib.Utils.Core.Options;
 using NetModular.Lib.Utils.Core.Result;
-using NetModular.Module.CodeGenerator.Application.ProjectService.ResultModels;
-using NetModular.Module.CodeGenerator.Application.ProjectService.ViewModels;
+using NetModular.Lib.Utils.Core.SystemConfig;
+using NetModular.Module.CodeGenerator.Application.ModuleService.ResultModels;
+using NetModular.Module.CodeGenerator.Application.ModuleService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Class;
 using NetModular.Module.CodeGenerator.Domain.ClassMethod;
 using NetModular.Module.CodeGenerator.Domain.Enum;
 using NetModular.Module.CodeGenerator.Domain.EnumItem;
 using NetModular.Module.CodeGenerator.Domain.ModelProperty;
-using NetModular.Module.CodeGenerator.Domain.Project;
-using NetModular.Module.CodeGenerator.Domain.Project.Models;
+using NetModular.Module.CodeGenerator.Domain.Module;
+using NetModular.Module.CodeGenerator.Domain.Module.Models;
 using NetModular.Module.CodeGenerator.Domain.Property;
-using NetModular.Module.CodeGenerator.Infrastructure.Options;
+using NetModular.Module.CodeGenerator.Infrastructure;
 using NetModular.Module.CodeGenerator.Infrastructure.Repositories;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Default;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
-namespace NetModular.Module.CodeGenerator.Application.ProjectService
+namespace NetModular.Module.CodeGenerator.Application.ModuleService
 {
-    public class ProjectService : IProjectService
+    public class ModuleService : IModuleService
     {
         private readonly IMapper _mapper;
-        private readonly ModuleCommonOptions _commonOptions;
-        private readonly CodeGeneratorOptions _codeGeneratorOptions;
-        private readonly IProjectRepository _repository;
+        private readonly IModuleRepository _repository;
         private readonly IClassRepository _classRepository;
         private readonly IPropertyRepository _propertyRepository;
         private readonly IEnumRepository _enumRepository;
@@ -39,8 +36,10 @@ public class ProjectService : IProjectService
         private readonly IModelPropertyRepository _modelPropertyRepository;
         private readonly IClassMethodRepository _classMethodRepository;
         private readonly CodeGeneratorDbContext _dbContext;
+        private readonly CodeGeneratorOptions _codeGeneratorOptions;
+        private readonly SystemConfigModel _systemConfig;
 
-        public ProjectService(IProjectRepository repository, IMapper mapper, IOptionsMonitor<ModuleCommonOptions> optionsMonitor, IClassRepository classRepository, IPropertyRepository propertyRepository, IEnumRepository enumRepository, IEnumItemRepository enumItemRepository, IModelPropertyRepository modelPropertyRepository, IOptionsMonitor<CodeGeneratorOptions> codeGeneratorOptions, IClassMethodRepository classMethodRepository, CodeGeneratorDbContext dbContext)
+        public ModuleService(IModuleRepository repository, IMapper mapper, IClassRepository classRepository, IPropertyRepository propertyRepository, IEnumRepository enumRepository, IEnumItemRepository enumItemRepository, IModelPropertyRepository modelPropertyRepository, IClassMethodRepository classMethodRepository, CodeGeneratorDbContext dbContext, CodeGeneratorOptions codeGeneratorOptions, SystemConfigModel systemConfig)
         {
             _repository = repository;
             _mapper = mapper;
@@ -51,13 +50,13 @@ public ProjectService(IProjectRepository repository, IMapper mapper, IOptionsMon
             _modelPropertyRepository = modelPropertyRepository;
             _classMethodRepository = classMethodRepository;
             _dbContext = dbContext;
-            _codeGeneratorOptions = codeGeneratorOptions.CurrentValue;
-            _commonOptions = optionsMonitor.CurrentValue;
+            _codeGeneratorOptions = codeGeneratorOptions;
+            _systemConfig = systemConfig;
         }
 
-        public async Task<IResultModel> Query(ProjectQueryModel model)
+        public async Task<IResultModel> Query(ModuleQueryModel model)
         {
-            var result = new QueryResultModel<ProjectEntity>
+            var result = new QueryResultModel<ModuleEntity>
             {
                 Rows = await _repository.Query(model),
                 Total = model.TotalCount
@@ -65,9 +64,9 @@ public async Task<IResultModel> Query(ProjectQueryModel model)
             return ResultModel.Success(result);
         }
 
-        public async Task<IResultModel> Add(ProjectAddModel model)
+        public async Task<IResultModel> Add(ModuleAddModel model)
         {
-            var entity = _mapper.Map<ProjectEntity>(model);
+            var entity = _mapper.Map<ModuleEntity>(model);
             var result = await _repository.AddAsync(entity);
             return ResultModel.Result(result);
         }
@@ -83,13 +82,13 @@ public async Task<IResultModel> Delete(Guid id)
                 var result = await _repository.SoftDeleteAsync(id, uow);
                 if (result)
                 {
-                    result = await _classRepository.DeleteByProject(id, uow);
+                    result = await _classRepository.DeleteByModule(id, uow);
                     if (result)
                     {
-                        result = await _propertyRepository.DeleteByProject(id, uow);
+                        result = await _propertyRepository.DeleteByModule(id, uow);
                         if (result)
                         {
-                            result = await _modelPropertyRepository.DeleteByProject(id, uow);
+                            result = await _modelPropertyRepository.DeleteByModule(id, uow);
                             if (result)
                             {
                                 uow.Commit();
@@ -109,11 +108,11 @@ public async Task<IResultModel> Edit(Guid id)
             if (entity == null)
                 return ResultModel.NotExists;
 
-            var model = _mapper.Map<ProjectUpdateModel>(entity);
+            var model = _mapper.Map<ModuleUpdateModel>(entity);
             return ResultModel.Success(model);
         }
 
-        public async Task<IResultModel> Update(ProjectUpdateModel model)
+        public async Task<IResultModel> Update(ModuleUpdateModel model)
         {
             var entity = await _repository.GetAsync(model.Id);
             if (entity == null)
@@ -125,28 +124,28 @@ public async Task<IResultModel> Update(ProjectUpdateModel model)
             return ResultModel.Result(result);
         }
 
-        public Task<IResultModel<ProjectBuildCodeResultModel>> BuildCode(ProjectBuildCodeModel model)
+        public Task<IResultModel<ModuleBuildCodeResultModel>> BuildCode(ModuleBuildCodeModel model)
         {
             return BuildCode(model.Id);
         }
 
-        public async Task<IResultModel<ProjectBuildCodeResultModel>> BuildCode(Guid projectId, IList<ClassEntity> classList = null)
+        public async Task<IResultModel<ModuleBuildCodeResultModel>> BuildCode(Guid moduleId, IList<ClassEntity> classList = null)
         {
-            var result = new ResultModel<ProjectBuildCodeResultModel>();
+            var result = new ResultModel<ModuleBuildCodeResultModel>();
 
-            var project = await _repository.GetAsync(projectId);
-            if (project == null)
-                return result.Failed("项目不存在");
+            var module = await _repository.GetAsync(moduleId);
+            if (module == null)
+                return result.Failed("模块不存在");
 
-            //创建项目生成对象
-            var projectBuildModel = _mapper.Map<ProjectBuildModel>(project);
+            //创建模块生成对象
+            var moduleBuildModel = _mapper.Map<ModuleBuildModel>(module);
 
-            projectBuildModel.Prefix = _codeGeneratorOptions.Prefix;
-            projectBuildModel.UIPrefix = _codeGeneratorOptions.UIPrefix;
+            moduleBuildModel.Prefix = _codeGeneratorOptions.Prefix;
+            moduleBuildModel.UiPrefix = _codeGeneratorOptions.UiPrefix;
 
             var id = Guid.NewGuid().ToString();
-            var rootPath = Path.Combine(_commonOptions.TempPath, _codeGeneratorOptions.BuildCodePath);
-            var moduleFullName = $"{_codeGeneratorOptions.Prefix}.Module.{project.Code}";
+            var rootPath = _codeGeneratorOptions.BuildCodePath;
+            var moduleFullName = $"{_codeGeneratorOptions.Prefix}.Module.{module.Code}";
             var buildModel = new TemplateBuildModel
             {
                 RootPath = Path.Combine(rootPath, id, moduleFullName),
@@ -156,7 +155,7 @@ public async Task<IResultModel<ProjectBuildCodeResultModel>> BuildCode(Guid proj
             {
                 //如果classList参数为null，表示生成整个解决方案
                 buildModel.GenerateSln = true;
-                classList = await _classRepository.QueryAllByProject(project.Id);
+                classList = await _classRepository.QueryAllByModule(module.Id);
             }
 
             foreach (var classEntity in classList)
@@ -225,20 +224,24 @@ public async Task<IResultModel<ProjectBuildCodeResultModel>> BuildCode(Guid proj
 
                 classBuildModel.Method = await _classMethodRepository.GetByClass(classEntity.Id);
 
-                projectBuildModel.ClassList.Add(classBuildModel);
+                moduleBuildModel.ClassList.Add(classBuildModel);
             }
 
-            buildModel.Project = projectBuildModel;
+            buildModel.Module = moduleBuildModel;
 
             var builder = new DefaultTemplateBuilder();
             builder.Build(buildModel);
 
-            ZipFile.CreateFromDirectory(Path.Combine(rootPath, id), Path.Combine(rootPath, id + ".zip"));
+            var outputPath = Path.Combine(rootPath, id);
+            ZipFile.CreateFromDirectory(outputPath, Path.Combine(rootPath, id + ".zip"));
+
+            //删除临时文件
+            Directory.Delete(outputPath, true);
 
-            var resultModel = new ProjectBuildCodeResultModel
+            var resultModel = new ModuleBuildCodeResultModel
             {
                 Id = id,
-                Name = projectBuildModel.Name + ".zip"
+                Name = moduleBuildModel.Name + ".zip"
             };
 
             return result.Success(resultModel);
diff --git a/src/Library/Application/ProjectService/ResultModels/ProjectBuildCodeResultModel.cs b/src/Library/Application/ModuleService/ResultModels/ModuleBuildCodeResultModel.cs
similarity index 57%
rename from src/Library/Application/ProjectService/ResultModels/ProjectBuildCodeResultModel.cs
rename to src/Library/Application/ModuleService/ResultModels/ModuleBuildCodeResultModel.cs
index 30aa941..ce24226 100644
--- a/src/Library/Application/ProjectService/ResultModels/ProjectBuildCodeResultModel.cs
+++ b/src/Library/Application/ModuleService/ResultModels/ModuleBuildCodeResultModel.cs
@@ -1,9 +1,9 @@
-namespace NetModular.Module.CodeGenerator.Application.ProjectService.ResultModels
+namespace NetModular.Module.CodeGenerator.Application.ModuleService.ResultModels
 {
     /// <summary>
     /// 项目生成代码返回模型
     /// </summary>
-    public class ProjectBuildCodeResultModel
+    public class ModuleBuildCodeResultModel
     {
         public string Id { get; set; }
 
diff --git a/src/Library/Application/ProjectService/ViewModels/ProjectAddModel.cs b/src/Library/Application/ModuleService/ViewModels/ModuleAddModel.cs
similarity index 60%
rename from src/Library/Application/ProjectService/ViewModels/ProjectAddModel.cs
rename to src/Library/Application/ModuleService/ViewModels/ModuleAddModel.cs
index f9cfdfb..cbc3171 100644
--- a/src/Library/Application/ProjectService/ViewModels/ProjectAddModel.cs
+++ b/src/Library/Application/ModuleService/ViewModels/ModuleAddModel.cs
@@ -1,16 +1,16 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace NetModular.Module.CodeGenerator.Application.ProjectService.ViewModels
+namespace NetModular.Module.CodeGenerator.Application.ModuleService.ViewModels
 {
     /// <summary>
-    /// 项目添加
+    /// 添加模块
     /// </summary>
-    public class ProjectAddModel
+    public class ModuleAddModel
     {
         /// <summary>
         /// 名称
         /// </summary>
-        [Required(ErrorMessage = "请输入项目名称")]
+        [Required(ErrorMessage = "请输入名称")]
         public string Name { get; set; }
 
         /// <summary>
@@ -22,9 +22,15 @@ public class ProjectAddModel
         /// <summary>
         /// 编码
         /// </summary>
-        [Required(ErrorMessage = "请输入项目编码")]
+        [Required(ErrorMessage = "请输入编码")]
         public string Code { get; set; }
 
+        /// <summary>
+        /// 图标
+        /// </summary>
+        [Required(ErrorMessage = "请选择图标")]
+        public string Icon { get; set; }
+
         /// <summary>
         /// 版权声明
         /// </summary>
diff --git a/src/Library/Application/ProjectService/ViewModels/ProjectBuildCodeModel.cs b/src/Library/Application/ModuleService/ViewModels/ModuleBuildCodeModel.cs
similarity index 71%
rename from src/Library/Application/ProjectService/ViewModels/ProjectBuildCodeModel.cs
rename to src/Library/Application/ModuleService/ViewModels/ModuleBuildCodeModel.cs
index 9abd7cc..b488783 100644
--- a/src/Library/Application/ProjectService/ViewModels/ProjectBuildCodeModel.cs
+++ b/src/Library/Application/ModuleService/ViewModels/ModuleBuildCodeModel.cs
@@ -1,12 +1,12 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace NetModular.Module.CodeGenerator.Application.ProjectService.ViewModels
+namespace NetModular.Module.CodeGenerator.Application.ModuleService.ViewModels
 {
     /// <summary>
     /// 生成代码模型
     /// </summary>
-    public class ProjectBuildCodeModel
+    public class ModuleBuildCodeModel
     {
         /// <summary>
         /// 项目编号
diff --git a/src/Library/Application/ProjectService/ViewModels/ProjectUpdateModel.cs b/src/Library/Application/ModuleService/ViewModels/ModuleUpdateModel.cs
similarity index 68%
rename from src/Library/Application/ProjectService/ViewModels/ProjectUpdateModel.cs
rename to src/Library/Application/ModuleService/ViewModels/ModuleUpdateModel.cs
index 68c76e2..5e31b1d 100644
--- a/src/Library/Application/ProjectService/ViewModels/ProjectUpdateModel.cs
+++ b/src/Library/Application/ModuleService/ViewModels/ModuleUpdateModel.cs
@@ -1,12 +1,12 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace NetModular.Module.CodeGenerator.Application.ProjectService.ViewModels
+namespace NetModular.Module.CodeGenerator.Application.ModuleService.ViewModels
 {
     /// <summary>
     /// 项目编辑
     /// </summary>
-    public class ProjectUpdateModel : ProjectAddModel
+    public class ModuleUpdateModel : ModuleAddModel
     {
         /// <summary>
         /// 编号
diff --git a/src/Library/Application/ProjectService/_MapperConfig.cs b/src/Library/Application/ModuleService/_MapperConfig.cs
similarity index 59%
rename from src/Library/Application/ProjectService/_MapperConfig.cs
rename to src/Library/Application/ModuleService/_MapperConfig.cs
index b6ad059..d20547a 100644
--- a/src/Library/Application/ProjectService/_MapperConfig.cs
+++ b/src/Library/Application/ModuleService/_MapperConfig.cs
@@ -1,24 +1,24 @@
 using AutoMapper;
 using NetModular.Lib.Mapper.AutoMapper;
-using NetModular.Module.CodeGenerator.Application.ProjectService.ViewModels;
+using NetModular.Module.CodeGenerator.Application.ModuleService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Class;
 using NetModular.Module.CodeGenerator.Domain.ModelProperty;
-using NetModular.Module.CodeGenerator.Domain.Project;
+using NetModular.Module.CodeGenerator.Domain.Module;
 using NetModular.Module.CodeGenerator.Domain.Property;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
-namespace NetModular.Module.CodeGenerator.Application.ProjectService
+namespace NetModular.Module.CodeGenerator.Application.ModuleService
 {
     public class MapperConfig : IMapperConfig
     {
         public void Bind(IMapperConfigurationExpression cfg)
         {
-            cfg.CreateMap<ProjectAddModel, ProjectEntity>();
-            cfg.CreateMap<ProjectEntity, ProjectUpdateModel>();
-            cfg.CreateMap<ProjectUpdateModel, ProjectEntity>();
+            cfg.CreateMap<ModuleAddModel, ModuleEntity>();
+            cfg.CreateMap<ModuleEntity, ModuleUpdateModel>();
+            cfg.CreateMap<ModuleUpdateModel, ModuleEntity>();
 
             //代码生成
-            cfg.CreateMap<ProjectEntity, ProjectBuildModel>();
+            cfg.CreateMap<ModuleEntity, ModuleBuildModel>();
             cfg.CreateMap<ClassEntity, ClassBuildModel>();
             cfg.CreateMap<PropertyEntity, PropertyBuildModel>();
             cfg.CreateMap<ModelPropertyEntity, ModelPropertyBuildModel>();
diff --git a/src/Library/Application/PropertyService/PropertyService.cs b/src/Library/Application/PropertyService/PropertyService.cs
index 4bb95ef..4b776f7 100644
--- a/src/Library/Application/PropertyService/PropertyService.cs
+++ b/src/Library/Application/PropertyService/PropertyService.cs
@@ -44,7 +44,7 @@ public async Task<IResultModel> Add(PropertyAddModel model)
                 return ResultModel.Failed("关联类不存在");
 
             var entity = _mapper.Map<PropertyEntity>(model);
-            entity.ProjectId = classEntity.ProjectId;
+            entity.ModuleId = classEntity.ModuleId;
 
             if (await _repository.Exists(entity))
             {
diff --git a/src/Library/Domain/Class/ClassEntity.cs b/src/Library/Domain/Class/ClassEntity.cs
index 1d2fd43..b45ce5c 100644
--- a/src/Library/Domain/Class/ClassEntity.cs
+++ b/src/Library/Domain/Class/ClassEntity.cs
@@ -11,9 +11,9 @@ namespace NetModular.Module.CodeGenerator.Domain.Class
     public partial class ClassEntity : EntityBase
     {
         /// <summary>
-        /// 项目编号
+        /// 模块ID
         /// </summary>
-        public Guid ProjectId { get; set; }
+        public Guid ModuleId { get; set; }
 
         /// <summary>
         /// 名称
@@ -34,5 +34,10 @@ public partial class ClassEntity : EntityBase
         /// 说明
         /// </summary>
         public string Remarks { get; set; }
+
+        /// <summary>
+        /// 菜单图标
+        /// </summary>
+        public string MenuIcon { get; set; }
     }
 }
diff --git a/src/Library/Domain/Class/IClassRepository.cs b/src/Library/Domain/Class/IClassRepository.cs
index bcbdfd7..1fd40d7 100644
--- a/src/Library/Domain/Class/IClassRepository.cs
+++ b/src/Library/Domain/Class/IClassRepository.cs
@@ -19,11 +19,11 @@ public interface IClassRepository : IRepository<ClassEntity>
         Task<IList<ClassEntity>> Query(ClassQueryModel model);
 
         /// <summary>
-        /// 查询指定项目的所有类列表
+        /// 查询指定模块的所有类列表
         /// </summary>
-        /// <param name="projectId"></param>
+        /// <param name="moduleId"></param>
         /// <returns></returns>
-        Task<IList<ClassEntity>> QueryAllByProject(Guid projectId);
+        Task<IList<ClassEntity>> QueryAllByModule(Guid moduleId);
 
         /// <summary>
         /// 是否存在
@@ -32,11 +32,11 @@ public interface IClassRepository : IRepository<ClassEntity>
         Task<bool> Exists(ClassEntity entity);
 
         /// <summary>
-        /// 删除制定项目的所有类
+        /// 删除制定模块的所有类
         /// </summary>
-        /// <param name="projectId"></param>
+        /// <param name="moduleId"></param>
         /// <param name="uow"></param>
         /// <returns></returns>
-        Task<bool> DeleteByProject(Guid projectId, IUnitOfWork uow);
+        Task<bool> DeleteByModule(Guid moduleId, IUnitOfWork uow);
     }
 }
diff --git a/src/Library/Domain/Class/Models/ClassQueryModel.cs b/src/Library/Domain/Class/Models/ClassQueryModel.cs
index 566dde0..885b6f8 100644
--- a/src/Library/Domain/Class/Models/ClassQueryModel.cs
+++ b/src/Library/Domain/Class/Models/ClassQueryModel.cs
@@ -7,10 +7,10 @@ namespace NetModular.Module.CodeGenerator.Domain.Class.Models
     public class ClassQueryModel : QueryModel
     {
         /// <summary>
-        /// 所有项目
+        /// 所有模块
         /// </summary>
-        [Required(ErrorMessage = "选择项目")]
-        public Guid ProjectId { get; set; }
+        [Required(ErrorMessage = "选择模块")]
+        public Guid ModuleId { get; set; }
 
         /// <summary>
         /// 名称
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 6a9e035..cc2c89d 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.6.7" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.6.7" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.6.5" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.7.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.7.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.7.1" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Domain/ModelProperty/IModelPropertyRepository.cs b/src/Library/Domain/ModelProperty/IModelPropertyRepository.cs
index 802bfe5..605d00e 100644
--- a/src/Library/Domain/ModelProperty/IModelPropertyRepository.cs
+++ b/src/Library/Domain/ModelProperty/IModelPropertyRepository.cs
@@ -36,11 +36,11 @@ public interface IModelPropertyRepository : IRepository<ModelPropertyEntity>
         Task<bool> Exists(ModelPropertyEntity entity);
 
         /// <summary>
-        /// 删除指定类的所有属性
+        /// 删除指定模块的所有属性
         /// </summary>
-        /// <param name="projectId"></param>
+        /// <param name="moduleId"></param>
         /// <param name="uow"></param>
         /// <returns></returns>
-        Task<bool> DeleteByProject(Guid projectId, IUnitOfWork uow);
+        Task<bool> DeleteByModule(Guid moduleId, IUnitOfWork uow);
     }
 }
diff --git a/src/Library/Domain/ModelProperty/ModelPropertyEntity.cs b/src/Library/Domain/ModelProperty/ModelPropertyEntity.cs
index 78190ff..717a178 100644
--- a/src/Library/Domain/ModelProperty/ModelPropertyEntity.cs
+++ b/src/Library/Domain/ModelProperty/ModelPropertyEntity.cs
@@ -9,9 +9,9 @@ namespace NetModular.Module.CodeGenerator.Domain.ModelProperty
     public partial class ModelPropertyEntity : EntityBase
     {
         /// <summary>
-        /// 项目编号
+        /// 模块编号
         /// </summary>
-        public Guid ProjectId { get; set; }
+        public Guid ModuleId { get; set; }
 
         /// <summary>
         /// 所属类
diff --git a/src/Library/Domain/Project/IProjectRepository.cs b/src/Library/Domain/Module/IModuleRepository.cs
similarity index 55%
rename from src/Library/Domain/Project/IProjectRepository.cs
rename to src/Library/Domain/Module/IModuleRepository.cs
index 19aa8fb..88a836b 100644
--- a/src/Library/Domain/Project/IProjectRepository.cs
+++ b/src/Library/Domain/Module/IModuleRepository.cs
@@ -1,20 +1,20 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using NetModular.Lib.Data.Abstractions;
-using NetModular.Module.CodeGenerator.Domain.Project.Models;
+using NetModular.Module.CodeGenerator.Domain.Module.Models;
 
-namespace NetModular.Module.CodeGenerator.Domain.Project
+namespace NetModular.Module.CodeGenerator.Domain.Module
 {
     /// <summary>
     /// 项目仓储
     /// </summary>
-    public interface IProjectRepository : IRepository<ProjectEntity>
+    public interface IModuleRepository : IRepository<ModuleEntity>
     {
         /// <summary>
         /// 查询
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        Task<IList<ProjectEntity>> Query(ProjectQueryModel model);
+        Task<IList<ModuleEntity>> Query(ModuleQueryModel model);
     }
 }
diff --git a/src/Library/Domain/Project/Models/ProjectQueryModel.cs b/src/Library/Domain/Module/Models/ModuleQueryModel.cs
similarity index 70%
rename from src/Library/Domain/Project/Models/ProjectQueryModel.cs
rename to src/Library/Domain/Module/Models/ModuleQueryModel.cs
index 86cc650..ab6060e 100644
--- a/src/Library/Domain/Project/Models/ProjectQueryModel.cs
+++ b/src/Library/Domain/Module/Models/ModuleQueryModel.cs
@@ -1,8 +1,8 @@
 using NetModular.Lib.Data.Query;
 
-namespace NetModular.Module.CodeGenerator.Domain.Project.Models
+namespace NetModular.Module.CodeGenerator.Domain.Module.Models
 {
-    public class ProjectQueryModel : QueryModel
+    public class ModuleQueryModel : QueryModel
     {
         /// <summary>
         /// 名称
diff --git a/src/Library/Domain/Module/ModuleEntity.Extend.cs b/src/Library/Domain/Module/ModuleEntity.Extend.cs
new file mode 100644
index 0000000..c11b72f
--- /dev/null
+++ b/src/Library/Domain/Module/ModuleEntity.Extend.cs
@@ -0,0 +1,7 @@
+namespace NetModular.Module.CodeGenerator.Domain.Module
+{
+    public partial class ModuleEntity
+    {
+
+    }
+}
diff --git a/src/Library/Domain/Project/ProjectEntity.cs b/src/Library/Domain/Module/ModuleEntity.cs
similarity index 69%
rename from src/Library/Domain/Project/ProjectEntity.cs
rename to src/Library/Domain/Module/ModuleEntity.cs
index 4af2727..87530fc 100644
--- a/src/Library/Domain/Project/ProjectEntity.cs
+++ b/src/Library/Domain/Module/ModuleEntity.cs
@@ -1,13 +1,13 @@
 using NetModular.Lib.Data.Abstractions.Attributes;
 using NetModular.Lib.Data.Core.Entities.Extend;
 
-namespace NetModular.Module.CodeGenerator.Domain.Project
+namespace NetModular.Module.CodeGenerator.Domain.Module
 {
     /// <summary>
-    /// 项目
+    /// 模块信息
     /// </summary>
-    [Table("Project")]
-    public partial class ProjectEntity : EntityBaseWithSoftDelete
+    [Table("Module")]
+    public partial class ModuleEntity : EntityBaseWithSoftDelete
     {
         /// <summary>
         /// 名称
@@ -25,6 +25,12 @@ public partial class ProjectEntity : EntityBaseWithSoftDelete
         /// </summary>
         public string Code { get; set; }
 
+        /// <summary>
+        /// 图标
+        /// </summary>
+        [Nullable]
+        public string Icon { get; set; }
+
         /// <summary>
         /// 版权声明
         /// </summary>
diff --git a/src/Library/Domain/Project/ProjectEntity.Extend.cs b/src/Library/Domain/Project/ProjectEntity.Extend.cs
deleted file mode 100644
index 0fe50d7..0000000
--- a/src/Library/Domain/Project/ProjectEntity.Extend.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace NetModular.Module.CodeGenerator.Domain.Project
-{
-    public partial class ProjectEntity
-    {
-
-    }
-}
diff --git a/src/Library/Domain/Property/IPropertyRepository.cs b/src/Library/Domain/Property/IPropertyRepository.cs
index abf9702..773f009 100644
--- a/src/Library/Domain/Property/IPropertyRepository.cs
+++ b/src/Library/Domain/Property/IPropertyRepository.cs
@@ -48,11 +48,11 @@ public interface IPropertyRepository : IRepository<PropertyEntity>
         Task<bool> DeleteByClass(Guid classId, IUnitOfWork uow);
 
         /// <summary>
-        /// 删除指定类的所有属性
+        /// 删除指定项目的所有属性
         /// </summary>
-        /// <param name="projectId"></param>
+        /// <param name="moduleId"></param>
         /// <param name="uow"></param>
         /// <returns></returns>
-        Task<bool> DeleteByProject(Guid projectId, IUnitOfWork uow);
+        Task<bool> DeleteByModule(Guid moduleId, IUnitOfWork uow);
     }
 }
diff --git a/src/Library/Domain/Property/PropertyEntity.cs b/src/Library/Domain/Property/PropertyEntity.cs
index a02d218..12a043f 100644
--- a/src/Library/Domain/Property/PropertyEntity.cs
+++ b/src/Library/Domain/Property/PropertyEntity.cs
@@ -11,9 +11,9 @@ namespace NetModular.Module.CodeGenerator.Domain.Property
     public partial class PropertyEntity : EntityBase
     {
         /// <summary>
-        /// 项目编号
+        /// 模块编号
         /// </summary>
-        public Guid ProjectId { get; set; }
+        public Guid ModuleId { get; set; }
 
         /// <summary>
         /// 类编号
diff --git a/src/Library/Infrastructure/BaseEntityPropertyCollection.cs b/src/Library/Infrastructure/BaseEntityPropertyCollection.cs
index f3742aa..13af209 100644
--- a/src/Library/Infrastructure/BaseEntityPropertyCollection.cs
+++ b/src/Library/Infrastructure/BaseEntityPropertyCollection.cs
@@ -109,7 +109,7 @@ private List<PropertyEntity> GetEntityBaseWithSoftDeleteProperties(PropertyType
                 new PropertyEntity
                 {
                     Name = "Id", IsPrimaryKey = true, IsInherit = true, Remarks = "主键", Type = primaryKeyPropertyType,
-                    ShowInList = true, Length=(primaryKeyPropertyType==PropertyType.String)?50:0
+                    ShowInList = true, Length = (primaryKeyPropertyType == PropertyType.String) ? 50 : 0
                 },
                 new PropertyEntity
                 {
@@ -129,15 +129,15 @@ private List<PropertyEntity> GetEntityBaseWithSoftDeleteProperties(PropertyType
                 },
                 new PropertyEntity
                 {
-                    Name = "Deleted", IsInherit = true, Remarks = "已删除",Type = PropertyType.Bool, Sort = 1004
+                    Name = "Deleted", IsInherit = true, Remarks = "已删除", Type = PropertyType.Bool, Sort = 1004
                 },
                 new PropertyEntity
                 {
-                    Name = "DeletedTime",IsInherit = true, Remarks = "删除时间",Type = PropertyType.DateTime, Sort = 1005
+                    Name = "DeletedTime", IsInherit = true, Remarks = "删除时间", Type = PropertyType.DateTime, Sort = 1005
                 },
                 new PropertyEntity
                 {
-                    Name = "DeletedBy", IsInherit = true, Remarks = "删除人",Type = PropertyType.Guid, Sort = 1006
+                    Name = "DeletedBy", IsInherit = true, Remarks = "删除人", Type = PropertyType.Guid, Sort = 1006
                 }
             };
         }
diff --git a/src/Library/Infrastructure/CodeGeneratorOptions.cs b/src/Library/Infrastructure/CodeGeneratorOptions.cs
new file mode 100644
index 0000000..52f225d
--- /dev/null
+++ b/src/Library/Infrastructure/CodeGeneratorOptions.cs
@@ -0,0 +1,47 @@
+using System.IO;
+using NetModular.Lib.Options.Abstraction;
+using NetModular.Lib.Utils.Core.Extensions;
+using NetModular.Lib.Utils.Core.SystemConfig;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure
+{
+    public class CodeGeneratorOptions : IModuleOptions
+    {
+        public SystemConfigModel SystemConfig { get; set; }
+
+        private string _buildCodePath;
+
+        /// <summary>
+        /// 生成代码存储路径
+        /// </summary>
+        [ModuleOptionDefinition("生成代码存储路径", "默认保存在全局临时目录的CodeGenerator\\BuildCode路径下")]
+        public string BuildCodePath
+        {
+            get
+            {
+                if (_buildCodePath.IsNull())
+                {
+                    _buildCodePath = Path.Combine(SystemConfig.Path.TempPath, "CodeGenerator", "BuildCode");
+                }
+                else if (!Path.IsPathRooted(_buildCodePath))
+                {
+                    _buildCodePath = Path.Combine(SystemConfig.Path.TempPath, _buildCodePath);
+                }
+                return _buildCodePath;
+            }
+            set => _buildCodePath = value;
+        }
+
+        /// <summary>
+        /// 模块前缀(后端命名空间)
+        /// </summary>
+        [ModuleOptionDefinition("模块前缀", "该属性会作为后端命名空间前缀使用，如NetModular.Module.Admin")]
+        public string Prefix { get; set; } = "NetModular";
+
+        /// <summary>
+        /// 前端组件前缀
+        /// </summary>
+        [ModuleOptionDefinition("前端组件前缀", "前端组件前缀，如Nm，组件名称就是nm-list")]
+        public string UiPrefix { get; set; } = "Nm";
+    }
+}
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 6c8d079..698e2fe 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -4,10 +4,9 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
-  <Import Project="..\..\..\build\module.build.targets" />
-
   <ItemGroup>
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.6.6" />
+    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.7.1" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.7.1" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
@@ -15,6 +14,14 @@
     <ProjectReference Include="..\Domain\Domain.csproj" />
   </ItemGroup>
 
+  <!--打包模块相关文件到NuGet包中，此功能需要编译两次项目才行，因为打包操作在创建_module.json文件之前执行的-->
+  <ItemGroup>
+    <Content Include="$(SolutionDir)\src\WebHost\_modules*\**\*.*" PackagePath="contentFiles\any\any">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="Templates\Default\T4\script\NpmInstall.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
@@ -28,10 +35,6 @@
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>NpmUpdate.cs</LastGenOutput>
     </None>
-    <None Update="Templates\Default\T4\src\Library\Infrastructure\Options\ModuleOptionsConfigure.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>ModuleOptionsConfigure.cs</LastGenOutput>
-    </None>
     <None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt">
       <LastGenOutput>PostgreSQLRepository.cs</LastGenOutput>
       <Generator>TextTemplatingFilePreprocessor</Generator>
@@ -192,7 +195,7 @@
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>SQLiteRepository.cs</LastGenOutput>
     </None>
-    <None Update="Templates\Default\T4\src\Library\Infrastructure\Options\Options.tt">
+    <None Update="Templates\Default\T4\src\Library\Infrastructure\Options.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>Options.cs</LastGenOutput>
     </None>
@@ -284,14 +287,6 @@
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>jwtDevelopment.cs</LastGenOutput>
     </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\module.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>module.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\moduleDevelopment.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>moduleDevelopment.cs</LastGenOutput>
-    </None>
     <None Update="Templates\Default\T4\src\WebHost\config\logging.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>logging.cs</LastGenOutput>
@@ -431,11 +426,6 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>SQLiteRepository.tt</DependentUpon>
     </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Options\Options.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Options.tt</DependentUpon>
-    </Compile>
     <Compile Update="Templates\Default\T4\src\Library\Application\Csproj.*">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -681,11 +671,6 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>cacheDevelopment.tt</DependentUpon>
     </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Options\ModuleOptionsConfigure.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ModuleOptionsConfigure.tt</DependentUpon>
-    </Compile>
     <Compile Update="Templates\Default\T4\build\ModuleBuildTargets.*">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -716,6 +701,39 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>excelDevelopment.tt</DependentUpon>
     </Compile>
+    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Options.*">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Options.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\src\views\components\SavePage.*">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>SavePage.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Page.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Page.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\WebHost\config\db.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>db.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\WebHost\config\jwt.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>jwt.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\WebHost\config\loggingDevelopment.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>loggingDevelopment.tt</DependentUpon>
+    </Compile>
   </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Options/CodeGeneratorOptions.cs b/src/Library/Infrastructure/Options/CodeGeneratorOptions.cs
deleted file mode 100644
index 5c400d7..0000000
--- a/src/Library/Infrastructure/Options/CodeGeneratorOptions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.IO;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Options
-{
-    public class CodeGeneratorOptions
-    {
-        public CodeGeneratorOptions()
-        {
-            BuildCodePath = Path.Combine("CodeGenerator", "BuildCode");
-        }
-
-        /// <summary>
-        /// 生成代码路径(相对于临时目录的路径)
-        /// </summary>
-        public string BuildCodePath { get; set; }
-
-        /// <summary>
-        /// 项目前缀
-        /// </summary>
-        public string Prefix { get; set; }
-
-        /// <summary>
-        /// 前端UI组件前缀
-        /// </summary>
-        public string UIPrefix { get; set; }
-    }
-}
diff --git a/src/Library/Infrastructure/Options/ModuleOptionsConfigure.cs b/src/Library/Infrastructure/Options/ModuleOptionsConfigure.cs
deleted file mode 100644
index 98142c8..0000000
--- a/src/Library/Infrastructure/Options/ModuleOptionsConfigure.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using NetModular.Lib.Utils.Core.Options;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Options
-{
-    public class ModuleOptionsConfigure : IModuleOptionsConfigure
-    {
-        public void ConfigOptions(IServiceCollection services, IConfiguration configuration)
-        {
-            services.Configure<CodeGeneratorOptions>(configuration);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Repositories/MySql/ProjectRepository.cs b/src/Library/Infrastructure/Repositories/MySql/ModuleRepository.cs
similarity index 53%
rename from src/Library/Infrastructure/Repositories/MySql/ProjectRepository.cs
rename to src/Library/Infrastructure/Repositories/MySql/ModuleRepository.cs
index 92fbaca..7a0f37c 100644
--- a/src/Library/Infrastructure/Repositories/MySql/ProjectRepository.cs
+++ b/src/Library/Infrastructure/Repositories/MySql/ModuleRepository.cs
@@ -2,9 +2,9 @@
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.MySql
 {
-    public class ProjectRepository : SqlServer.ProjectRepository
+    public class ModuleRepository : SqlServer.ModuleRepository
     {
-        public ProjectRepository(IDbContext context) : base(context)
+        public ModuleRepository(IDbContext context) : base(context)
         {
         }
     }
diff --git a/src/Library/Infrastructure/Repositories/SQLite/ProjectRepository.cs b/src/Library/Infrastructure/Repositories/SQLite/ModuleRepository.cs
similarity index 53%
rename from src/Library/Infrastructure/Repositories/SQLite/ProjectRepository.cs
rename to src/Library/Infrastructure/Repositories/SQLite/ModuleRepository.cs
index b2fbd87..284b7bd 100644
--- a/src/Library/Infrastructure/Repositories/SQLite/ProjectRepository.cs
+++ b/src/Library/Infrastructure/Repositories/SQLite/ModuleRepository.cs
@@ -2,9 +2,9 @@
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.SQLite
 {
-    public class ProjectRepository : SqlServer.ProjectRepository
+    public class ModuleRepository : SqlServer.ModuleRepository
     {
-        public ProjectRepository(IDbContext context) : base(context)
+        public ModuleRepository(IDbContext context) : base(context)
         {
         }
     }
diff --git a/src/Library/Infrastructure/Repositories/SqlServer/ClassRepository.cs b/src/Library/Infrastructure/Repositories/SqlServer/ClassRepository.cs
index 2ef2624..be65937 100644
--- a/src/Library/Infrastructure/Repositories/SqlServer/ClassRepository.cs
+++ b/src/Library/Infrastructure/Repositories/SqlServer/ClassRepository.cs
@@ -20,7 +20,7 @@ public ClassRepository(IDbContext context) : base(context)
         public async Task<IList<ClassEntity>> Query(ClassQueryModel model)
         {
             var paging = model.Paging();
-            var query = Db.Find(m => m.ProjectId == model.ProjectId);
+            var query = Db.Find(m => m.ModuleId == model.ModuleId);
             query.WhereNotNull(model.Name, m => m.Name.Contains(model.Name) || m.Remarks.Contains(model.Name));
 
             var joinQuery = query.LeftJoin<AccountEntity>((x, y) => x.CreatedBy == y.Id);
@@ -37,21 +37,21 @@ public async Task<IList<ClassEntity>> Query(ClassQueryModel model)
             return list;
         }
 
-        public Task<IList<ClassEntity>> QueryAllByProject(Guid projectId)
+        public Task<IList<ClassEntity>> QueryAllByModule(Guid moduleId)
         {
-            return Db.Find(m => m.ProjectId == projectId).ToListAsync();
+            return Db.Find(m => m.ModuleId == moduleId).ToListAsync();
         }
 
         public Task<bool> Exists(ClassEntity entity)
         {
-            return Db.Find(m => m.ProjectId == entity.ProjectId && m.Name.Equals(entity.Name))
+            return Db.Find(m => m.ModuleId == entity.ModuleId && m.Name.Equals(entity.Name))
                 .WhereNotEmpty(entity.Id, m => m.Id != entity.Id)
                 .ExistsAsync();
         }
 
-        public Task<bool> DeleteByProject(Guid projectId, IUnitOfWork uow)
+        public Task<bool> DeleteByModule(Guid moduleId, IUnitOfWork uow)
         {
-            return Db.Find(m => m.ProjectId == projectId).UseUow(uow).DeleteAsync();
+            return Db.Find(m => m.ModuleId == moduleId).UseUow(uow).DeleteAsync();
         }
     }
 }
diff --git a/src/Library/Infrastructure/Repositories/SqlServer/ModelPropertyRepository.cs b/src/Library/Infrastructure/Repositories/SqlServer/ModelPropertyRepository.cs
index be14225..a0ca4fb 100644
--- a/src/Library/Infrastructure/Repositories/SqlServer/ModelPropertyRepository.cs
+++ b/src/Library/Infrastructure/Repositories/SqlServer/ModelPropertyRepository.cs
@@ -55,9 +55,9 @@ public Task<bool> Exists(ModelPropertyEntity entity)
             return query.ExistsAsync();
         }
 
-        public Task<bool> DeleteByProject(Guid projectId, IUnitOfWork uow)
+        public Task<bool> DeleteByModule(Guid moduleId, IUnitOfWork uow)
         {
-            return Db.Find(m => m.ProjectId == projectId).UseUow(uow).DeleteAsync();
+            return Db.Find(m => m.ModuleId == moduleId).UseUow(uow).DeleteAsync();
         }
     }
 }
diff --git a/src/Library/Infrastructure/Repositories/SqlServer/ProjectRepository.cs b/src/Library/Infrastructure/Repositories/SqlServer/ModuleRepository.cs
similarity index 74%
rename from src/Library/Infrastructure/Repositories/SqlServer/ProjectRepository.cs
rename to src/Library/Infrastructure/Repositories/SqlServer/ModuleRepository.cs
index ddaf689..781e2c5 100644
--- a/src/Library/Infrastructure/Repositories/SqlServer/ProjectRepository.cs
+++ b/src/Library/Infrastructure/Repositories/SqlServer/ModuleRepository.cs
@@ -5,18 +5,18 @@
 using NetModular.Lib.Data.Core;
 using NetModular.Lib.Data.Query;
 using NetModular.Module.Admin.Domain.Account;
-using NetModular.Module.CodeGenerator.Domain.Project;
-using NetModular.Module.CodeGenerator.Domain.Project.Models;
+using NetModular.Module.CodeGenerator.Domain.Module;
+using NetModular.Module.CodeGenerator.Domain.Module.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.SqlServer
 {
-    public class ProjectRepository : RepositoryAbstract<ProjectEntity>, IProjectRepository
+    public class ModuleRepository : RepositoryAbstract<ModuleEntity>, IModuleRepository
     {
-        public ProjectRepository(IDbContext context) : base(context)
+        public ModuleRepository(IDbContext context) : base(context)
         {
         }
 
-        public async Task<IList<ProjectEntity>> Query(ProjectQueryModel model)
+        public async Task<IList<ModuleEntity>> Query(ModuleQueryModel model)
         {
             var paging = model.Paging();
 
diff --git a/src/Library/Infrastructure/Repositories/SqlServer/PropertyRepository.cs b/src/Library/Infrastructure/Repositories/SqlServer/PropertyRepository.cs
index d763ef4..ffd5bc1 100644
--- a/src/Library/Infrastructure/Repositories/SqlServer/PropertyRepository.cs
+++ b/src/Library/Infrastructure/Repositories/SqlServer/PropertyRepository.cs
@@ -62,9 +62,9 @@ public Task<bool> DeleteByClass(Guid classId, IUnitOfWork uow)
             return Db.Find(m => m.ClassId == classId).UseUow(uow).DeleteAsync();
         }
 
-        public Task<bool> DeleteByProject(Guid projectId, IUnitOfWork uow)
+        public Task<bool> DeleteByModule(Guid moduleId, IUnitOfWork uow)
         {
-            return Db.Find(m => m.ProjectId == projectId).UseUow(uow).DeleteAsync();
+            return Db.Find(m => m.ModuleId == moduleId).UseUow(uow).DeleteAsync();
         }
     }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Readme.cs b/src/Library/Infrastructure/Templates/Default/T4/Readme.cs
index f0c5849..eab27ed 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Readme.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Readme.cs
@@ -28,7 +28,7 @@ public virtual string TransformText()
             this.Write("## ");
             
             #line 2 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\Readme.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Name));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Name));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Readme.tt b/src/Library/Infrastructure/Templates/Default/T4/Readme.tt
index f4b7986..f5e6d5c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Readme.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/Readme.tt
@@ -1,4 +1,4 @@
 <#@ template language="C#" #>
-## <#= _model.Project.Name #>
+## <#= _model.Module.Name #>
 
 ### 配置项
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Solution.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/Solution.Extend.cs
index a7e172b..a30e307 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Solution.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Solution.Extend.cs
@@ -22,7 +22,7 @@ public void Save()
             {
                 Directory.CreateDirectory(dir);
             }
-            var filePath = Path.Combine(dir, _model.Project.Code + ".sln");
+            var filePath = Path.Combine(dir, _model.Module.Code + ".sln");
             File.WriteAllText(filePath, content);
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.cs b/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.cs
index af8b0be..7032557 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.bu
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\build\ModuleBuildTargets.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\build\ModuleBuildTargets.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class ModuleBuildTargets : ModuleBuildTargetsBase
     {
@@ -30,19 +30,10 @@ public virtual string TransformText()
   <PropertyGroup>
     <ModulesDir>_modules\$(Id)</ModulesDir>
     <ModuleName>$(ModulesDir)\_module.json</ModuleName>
-    <ModuleInfo>{""Id"": ""$(Id)"",""Name"":""$(Name)"",""Version"":""$(Version)""}</ModuleInfo>
+    <ModuleInfo>{""Id"": ""$(Id)"",""Name"":""$(Name)"",""Icon"":""$(Icon)"",""Version"":""$(Version)""}</ModuleInfo>
   </PropertyGroup>
 
-  <!--Ƕ��module.json�ļ�-->
-  <ItemGroup Condition=""Exists('$(ModuleName)')"">
-    <Content Remove=""$(ModuleName)"" />
-  </ItemGroup>
-
-  <ItemGroup Condition=""Exists('$(ModuleName)')"">
-    <EmbeddedResource Include=""$(ModuleName)"" Watch=""false""/>
-  </ItemGroup>
-
-  <Target Name=""ModulesBuildBefore"" AfterTargets=""Build"">
+  <Target Name=""ModulesBuild"" AfterTargets=""Build"">
 
     <!--����modulesĿ¼-->
     <MakeDir Directories=""$(ModulesDir)""/>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.tt b/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.tt
index bfe780e..6218c98 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.tt
@@ -3,19 +3,10 @@
   <PropertyGroup>
     <ModulesDir>_modules\$(Id)</ModulesDir>
     <ModuleName>$(ModulesDir)\_module.json</ModuleName>
-    <ModuleInfo>{"Id": "$(Id)","Name":"$(Name)","Version":"$(Version)"}</ModuleInfo>
+    <ModuleInfo>{"Id": "$(Id)","Name":"$(Name)","Icon":"$(Icon)","Version":"$(Version)"}</ModuleInfo>
   </PropertyGroup>
 
-  <!--嵌入module.json文件-->
-  <ItemGroup Condition="Exists('$(ModuleName)')">
-    <Content Remove="$(ModuleName)" />
-  </ItemGroup>
-
-  <ItemGroup Condition="Exists('$(ModuleName)')">
-    <EmbeddedResource Include="$(ModuleName)" Watch="false"/>
-  </ItemGroup>
-
-  <Target Name="ModulesBuildBefore" AfterTargets="Build">
+  <Target Name="ModulesBuild" AfterTargets="Build">
 
     <!--创建modules目录-->
     <MakeDir Directories="$(ModulesDir)"/>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.cs
index 85f8a11..af9b182 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.cs
@@ -28,7 +28,7 @@ public virtual string TransformText()
             this.Write("cd ../src/UI/module-");
             
             #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmInstall.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.ToLower()));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.tt b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.tt
index c18a738..1761e57 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.tt
@@ -1,3 +1,3 @@
-cd ../src/UI/module-<#= _model.Project.Code.ToLower() #>
+cd ../src/UI/module-<#= _model.Module.Code.ToLower() #>
 npm --registry  https://registry.npmjs.org/ install
 pause
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.cs
index 44d6680..ea45d0e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.cs
@@ -28,7 +28,7 @@ public virtual string TransformText()
             this.Write("cd ../src/UI/module-");
             
             #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmPublish.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.ToLower()));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.tt b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.tt
index bc3b853..a6f3e24 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.tt
@@ -1,3 +1,3 @@
-cd ../src/UI/module-<#= _model.Project.Code.ToLower() #>
+cd ../src/UI/module-<#= _model.Module.Code.ToLower() #>
 npm --registry  https://registry.npmjs.org/ publish
 pause
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.cs
index bf66aa2..f8c7174 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.cs
@@ -28,7 +28,7 @@ public virtual string TransformText()
             this.Write("cd ../src/UI/module-");
             
             #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmUpdate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.ToLower()));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.tt b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.tt
index 5574ba9..c2d96cd 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.tt
@@ -1,3 +1,3 @@
-cd ../src/UI/module-<#= _model.Project.Code.ToLower() #>
+cd ../src/UI/module-<#= _model.Module.Code.ToLower() #>
 npm --registry  https://registry.npmjs.org/ update
 pause
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs
index 6a281cd..2dcb876 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs
@@ -11,7 +11,7 @@ public partial class DirectoryBuildProps : ITemplateHandler
         public DirectoryBuildProps(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
index 67c35dc..89c7392 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class DirectoryBuildProps : DirectoryBuildPropsBase
     {
@@ -27,27 +27,30 @@ public virtual string TransformText()
         {
             this.Write("<Project>\r\n  <PropertyGroup>\r\n    <Id>");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write("</Id>\r\n    <Name>");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Name));
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Name));
             
             #line default
             #line hidden
-            this.Write(@"</Name>
-    <Authors>Oldli</Authors>
-    <Version>1.0.0</Version>
-    <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
-    <NoWarn>$(NoWarn);1591</NoWarn>
-    <LangVersion>Latest</LangVersion>
-    <RootNamespacePrefix>");
+            this.Write("</Name>\r\n    <Authors>Oldli</Authors>\r\n    <Icon>");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Icon));
+            
+            #line default
+            #line hidden
+            this.Write("</Icon>\r\n    <Version>1.0.0</Version>\r\n    <Description>NetModular Module $(Id)($" +
+                    "(Name)) - $(MSBuildProjectName)</Description>\r\n    <NoWarn>$(NoWarn);1591</NoWar" +
+                    "n>\r\n    <LangVersion>Latest</LangVersion>\r\n    <RootNamespacePrefix>");
+            
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -61,11 +64,11 @@ public virtual string TransformText()
     <PackageOutputPath>$(SolutionDir)\_packages</PackageOutputPath>
     <Company>Oldli</Company>
     <Copyright>Oldli</Copyright>
-    <PackageProjectUrl>https://nm.iamoldli.com/docs/</PackageProjectUrl>
+    <PackageProjectUrl>https://docs.17mkh.com/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/iamoldli/NetModular.Module.");
             
-            #line 21 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 22 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
index 5bc88ca..52dc436 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
@@ -1,9 +1,10 @@
 <#@ template language="C#" #>
 <Project>
   <PropertyGroup>
-    <Id><#= _model.Project.Code #></Id>
-    <Name><#= _model.Project.Name #></Name>
+    <Id><#= _model.Module.Code #></Id>
+    <Name><#= _model.Module.Name #></Name>
     <Authors>Oldli</Authors>
+    <Icon><#= _model.Module.Icon #></Icon>
     <Version>1.0.0</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
@@ -17,7 +18,7 @@
     <PackageOutputPath>$(SolutionDir)\_packages</PackageOutputPath>
     <Company>Oldli</Company>
     <Copyright>Oldli</Copyright>
-    <PackageProjectUrl>https://nm.iamoldli.com/docs/</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/iamoldli/NetModular.Module.<#= _model.Project.Code #></RepositoryUrl>
+    <PackageProjectUrl>https://docs.17mkh.com/</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/iamoldli/NetModular.Module.<#= _model.Module.Code #></RepositoryUrl>
   </PropertyGroup>
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs
index eacfff5..8860548 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs
@@ -11,7 +11,7 @@ public partial class Csproj : ITemplateHandler
         public Csproj(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
index 97170bd..439327b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
@@ -34,14 +34,14 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Query\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Query\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Mapper.AutoMapper\" Version=\"1.5.0\" />\r\n  </ItemGroup>\r\n\r\n  <ItemGroup>\r\n    " +
+            this.Write(".Lib.Mapper.AutoMapper\" Version=\"1.7.0\" />\r\n  </ItemGroup>\r\n\r\n  <ItemGroup>\r\n    " +
                     "<ProjectReference Include=\"..\\Infrastructure\\Infrastructure.csproj\" />\r\n  </Item" +
                     "Group>\r\n\r\n</Project>\r\n");
             return this.GenerationEnvironment.ToString();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
index 658897f..7427804 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.5.9" />
-    <PackageReference Include="<#= _prefix #>.Lib.Mapper.AutoMapper" Version="1.5.0" />
+	<PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.7.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Mapper.AutoMapper" Version="1.7.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.Extend.cs
index ab7f922..ccf798b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.Extend.cs
@@ -13,16 +13,16 @@ public partial class MapperConfig : ITemplateHandler
         public MapperConfig(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => false;
 
         public void Save()
         {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.cs
index 0b62d83..a41345b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.cs
@@ -42,7 +42,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
@@ -63,7 +63,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
@@ -84,7 +84,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.tt
index 29a8828..2799d64 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.tt
@@ -1,10 +1,10 @@
 <#@ template language="C#" #>
 using AutoMapper;
 using <#= _prefix #>.Lib.Mapper.AutoMapper;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Application.<#= _class.Name #>Service.ViewModels;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Application.<#= _class.Name #>Service.ViewModels;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Application.<#= _class.Name #>Service
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Application.<#= _class.Name #>Service
 {
     public class MapperConfig : IMapperConfig
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.Extend.cs
index 019bad4..5185798 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.Extend.cs
@@ -13,16 +13,16 @@ public partial class ServiceImpl : ITemplateHandler
         public ServiceImpl(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => false;
 
         public void Save()
         {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.cs
index 53e2b4e..62d64a8 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.cs
@@ -43,7 +43,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
@@ -64,7 +64,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
@@ -85,7 +85,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
@@ -106,7 +106,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.tt
index 3f0d2d3..2ff97bc 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.tt
@@ -4,11 +4,11 @@ using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
 using <#= _prefix #>.Lib.Utils.Core.Result;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Application.<#= _class.Name #>Service.ViewModels;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>.Models;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Application.<#= _class.Name #>Service.ViewModels;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>.Models;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Application.<#= _class.Name #>Service
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Application.<#= _class.Name #>Service
 {
     public class <#= _class.Name #>Service : I<#= _class.Name #>Service
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.Extend.cs
index ff5bd46..faedf2a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.Extend.cs
@@ -13,16 +13,16 @@ public partial class ServiceInterface : ITemplateHandler
         public ServiceInterface(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => false;
 
         public void Save()
         {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.cs
index 2f10d01..cf76b4b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.cs
@@ -42,7 +42,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
@@ -63,7 +63,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
@@ -84,7 +84,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.tt
index de9e098..a0962c4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.tt
@@ -2,10 +2,10 @@
 using System;
 using System.Threading.Tasks;
 using <#= _prefix #>.Lib.Utils.Core.Result;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Application.<#= _class.Name #>Service.ViewModels;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>.Models;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Application.<#= _class.Name #>Service.ViewModels;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>.Models;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Application.<#= _class.Name #>Service
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Application.<#= _class.Name #>Service
 {
     /// <summary>
     /// <#= _class.Remarks #>服务
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.Extend.cs
index 943b134..3cda177 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.Extend.cs
@@ -13,16 +13,16 @@ public partial class AddModel : ITemplateHandler
         public AddModel(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => false;
 
         public void Save()
         {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.cs
index 0bcc78e..127bef4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.cs
@@ -37,7 +37,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
@@ -58,7 +58,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.tt
index f88ad8d..de3e1df 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.tt
@@ -3,9 +3,9 @@
 <#@ import namespace="NetModular.Module.CodeGenerator.Domain.Property" #>
 using System;
 using System.ComponentModel.DataAnnotations;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Application.<#= _class.Name #>Service.ViewModels
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Application.<#= _class.Name #>Service.ViewModels
 {
     /// <summary>
     /// <#= _class.Remarks #>添加模型
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.Extend.cs
index 0728497..cde9f85 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.Extend.cs
@@ -13,7 +13,7 @@ public partial class UpdateModel : ITemplateHandler
         public UpdateModel(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => false;
@@ -21,9 +21,9 @@ public UpdateModel(TemplateBuildModel model)
 
         public void Save()
         {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.cs
index 092b949..e592166 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.cs
@@ -17,7 +17,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class UpdateModel : UpdateModelBase
     {
@@ -29,110 +29,82 @@ public virtual string TransformText()
         {
             this.Write("using System;\r\nusing System.ComponentModel.DataAnnotations;\r\nusing ");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write(";\r\n\r\nnamespace ");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Application.");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service.ViewModels\r\n{\r\n    /// <summary>\r\n    /// ");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Remarks));
             
             #line default
             #line hidden
             this.Write("添加模型\r\n    /// </summary>\r\n    public class ");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
-            this.Write("UpdateModel\r\n    {\r\n        [Required(ErrorMessage = \"请选择要修改的");
+            this.Write("UpdateModel : ");
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_class.Remarks));
-            
-            #line default
-            #line hidden
-            this.Write("\")]\r\n        public ");
-            
-            #line 16 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_class.PrimaryKeyTypeName));
-            
-            #line default
-            #line hidden
-            this.Write(" Id { get; set; }\r\n\r\n    ");
-            
-            #line 18 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
- foreach(var p in _class.AddModelPropertyList){ 
-            
-            #line default
-            #line hidden
-            this.Write("        /// <summary>\r\n        /// ");
-            
-            #line 20 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
-            
-            #line default
-            #line hidden
-            this.Write("\r\n        /// </summary>\r\n        public ");
-            
-            #line 22 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(p.Type == PropertyType.Enum ? p.Enum.Name : p.Type.ToDescription()));
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
-            this.Write(" ");
+            this.Write("AddModel\r\n    {\r\n        [Required(ErrorMessage = \"请选择要修改的");
             
-            #line 22 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(p.Name));
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_class.Remarks));
             
             #line default
             #line hidden
-            this.Write(" { get; set; }\r\n\r\n    ");
+            this.Write("\")]\r\n        public ");
             
-            #line 24 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
- } 
+            #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_class.PrimaryKeyTypeName));
             
             #line default
             #line hidden
-            this.Write("\r\n    }\r\n}\r\n");
+            this.Write(" Id { get; set; }\r\n    }\r\n}\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.tt
index cec67d6..b12d24f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/UpdateModel.tt
@@ -3,25 +3,16 @@
 <#@ import namespace="NetModular.Module.CodeGenerator.Domain.Property" #>
 using System;
 using System.ComponentModel.DataAnnotations;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Application.<#= _class.Name #>Service.ViewModels
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Application.<#= _class.Name #>Service.ViewModels
 {
     /// <summary>
     /// <#= _class.Remarks #>添加模型
     /// </summary>
-    public class <#= _class.Name #>UpdateModel
+    public class <#= _class.Name #>UpdateModel : <#= _class.Name #>AddModel
     {
         [Required(ErrorMessage = "请选择要修改的<#= _class.Remarks #>")]
         public <#= _class.PrimaryKeyTypeName #> Id { get; set; }
-
-    <# foreach(var p in _class.AddModelPropertyList){ #>
-        /// <summary>
-        /// <#= p.Remarks #>
-        /// </summary>
-        public <#= p.Type == PropertyType.Enum ? p.Enum.Name : p.Type.ToDescription() #> <#= p.Name #> { get; set; }
-
-    <# } #>
-
     }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs
index 53a2df1..5d8e6bc 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs
@@ -11,7 +11,7 @@ public partial class Csproj : ITemplateHandler
         public Csproj(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
index 5aee2a5..94fc20b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
@@ -34,21 +34,21 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Core\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Core\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Query\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Query\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
             
             #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Core\" Version=\"1.5.9\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n\r\n");
+            this.Write(".Lib.Utils.Core\" Version=\"1.7.1\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
index d7e6ef6..f6a1f58 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Lib.Data.Core" Version="1.5.9" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.5.9" />
-    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="1.5.9" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.Core" Version="1.7.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.7.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="1.7.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.Extend.cs
index e7711e2..34ea155 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.Extend.cs
@@ -24,16 +24,16 @@ public partial class Entity : ITemplateHandler
         public Entity(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => false;
 
         public void Save()
         {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.cs
index 2b730a5..cdff8d2 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.cs
@@ -79,7 +79,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.tt
index d47954e..838b80c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.tt
@@ -9,7 +9,7 @@ using <#= _prefix #>.Lib.Data.Core.Entities;
 using <#= _prefix #>.Lib.Data.Core.Entities.Extend;
 <#} #>
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>
 {
     /// <summary>
     /// <#= _class.Remarks #>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.Extend.cs
index dcdac3f..63aae8a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.Extend.cs
@@ -13,7 +13,7 @@ public EntityEnum(TemplateBuildModel model, ClassBuildModel @class,EnumBuildMode
         {
             _model = model;
             _class = @class;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
             _enum = @enum;
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.cs
index 41c1114..48c29d7 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.cs
@@ -36,7 +36,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.tt
index fbcc2e2..4f62f2d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.tt
@@ -2,7 +2,7 @@
 <#@ import namespace="System.Linq" #>
 using System.ComponentModel;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>
 {
     /// <summary>
     /// <#= _enum.Remarks #>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.Extend.cs
index 9753e8e..a77abcd 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.Extend.cs
@@ -13,16 +13,16 @@ public partial class EntityExtend : ITemplateHandler
         public EntityExtend(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => false;
 
         public void Save()
         {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.cs
index a3f6178..cf75a6a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.cs
@@ -35,7 +35,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 2 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityExtend.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.tt
index 5c960b9..5c79274 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.tt
@@ -1,5 +1,5 @@
 <#@ template language="C#" #>
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>
 {
     public partial class <#= _class.Name #>Entity
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.Extend.cs
index 8ad65c4..15a2caa 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.Extend.cs
@@ -16,16 +16,16 @@ public partial class QueryModel : ITemplateHandler
         public QueryModel(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => false;
 
         public void Save()
         {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.cs
index f42fa6d..644bc77 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.cs
@@ -44,7 +44,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.tt
index 36ba88c..402513b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.tt
@@ -4,7 +4,7 @@
 using System;
 using <#= _prefix #>.Lib.Data.Query;
 
-namespace  <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>.Models
+namespace  <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>.Models
 {
     public class <#= _class.Name #>QueryModel : QueryModel
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.Extend.cs
index 62d240e..2f85718 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.Extend.cs
@@ -13,16 +13,16 @@ public partial class Repository : ITemplateHandler
         public Repository(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => false;
 
         public void Save()
         {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.cs
index 55fd92a..3f4f58d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.cs
@@ -49,7 +49,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
@@ -70,7 +70,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.tt
index 56a6b89..df872b8 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.tt
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using <#= _prefix #>.Lib.Data.Abstractions;
 using <#= _prefix #>.Lib.Data.Abstractions.Pagination;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>.Models;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>.Models;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>
 {
     /// <summary>
     /// <#= _class.Remarks #>仓储
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs
index 940d2d7..6fd16fe 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs
@@ -11,7 +11,7 @@ public partial class Csproj : ITemplateHandler
         public Csproj(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
index 47351a5..5ec0646 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
@@ -26,18 +26,38 @@ public partial class Csproj : CsprojBase
         public virtual string TransformText()
         {
             this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n  <PropertyGroup>\r\n    <TargetFramework>nets" +
-                    "tandard2.0</TargetFramework>\r\n  </PropertyGroup>\r\n\r\n  <Import Project=\"..\\..\\..\\" +
-                    "build\\module.build.targets\" />\r\n\r\n  <ItemGroup>\r\n    <PackageReference Include=\"" +
-                    "");
+                    "tandard2.0</TargetFramework>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n    <PackageR" +
+                    "eference Include=\"");
             
-            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Module.Admin.Domain\" Version=\"1.5.11\" />\r\n  </ItemGroup>\r\n \r\n  <ItemGroup>\r\n    " +
-                    "<ProjectReference Include=\"..\\Domain\\Domain.csproj\" />\r\n  </ItemGroup>\r\n\r\n</Proj" +
-                    "ect>\r\n");
+            this.Write(".Lib.Options.Abstraction\" Version=\"1.7.1\" />\r\n    <PackageReference Include=\"");
+            
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            
+            #line default
+            #line hidden
+            this.Write(@".Module.Admin.Domain"" Version=""1.7.1"" />
+  </ItemGroup>
+ 
+  <ItemGroup>
+    <ProjectReference Include=""..\Domain\Domain.csproj"" />
+  </ItemGroup>
+  
+  <!--���ģ������ļ���NuGet���У��˹�����Ҫ����������Ŀ���У���Ϊ��������ڴ���_module.json�ļ�֮ǰִ�е�-->
+  <ItemGroup>
+    <Content Include=""$(SolutionDir)\src\WebHost\_modules*\**\*.*"" PackagePath=""contentFiles\any\any"">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+    </Content>
+  </ItemGroup>
+
+</Project>
+");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
index d8d0ac2..5e8471c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
@@ -5,14 +5,21 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
-  <Import Project="..\..\..\build\module.build.targets" />
-
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Module.Admin.Domain" Version="1.5.11" />
+    <PackageReference Include="<#= _prefix #>.Lib.Options.Abstraction" Version="1.7.1" />
+    <PackageReference Include="<#= _prefix #>.Module.Admin.Domain" Version="1.7.1" />
   </ItemGroup>
  
   <ItemGroup>
     <ProjectReference Include="..\Domain\Domain.csproj" />
   </ItemGroup>
+  
+  <!--���ģ������ļ���NuGet���У��˹�����Ҫ����������Ŀ���У���Ϊ��������ڴ���_module.json�ļ�֮ǰִ�е�-->
+  <ItemGroup>
+    <Content Include="$(SolutionDir)\src\WebHost\_modules*\**\*.*" PackagePath="contentFiles\any\any">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+    </Content>
+  </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.Extend.cs
similarity index 78%
rename from src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.Extend.cs
rename to src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.Extend.cs
index 4111243..ad88125 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.Extend.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Infrastructure.Options
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Infrastructure
 {
     public partial class Options : ITemplateHandler
     {
@@ -11,19 +11,19 @@ public partial class Options : ITemplateHandler
         public Options(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => true;
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure/Options");
+            var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
             var content = TransformText();
-            var filePath = Path.Combine(dir, $"{_model.Project.Code}Options.cs");
+            var filePath = Path.Combine(dir, $"{_model.Module.Code}Options.cs");
             File.WriteAllText(filePath, content);
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs
similarity index 90%
rename from src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.cs
rename to src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs
index 834c526..d44ab48 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs
@@ -7,7 +7,7 @@
 //     重新生成代码，这些更改将会丢失。
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Infrastructure.Options
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Infrastructure
 {
     using System;
     
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options\Options.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Options : OptionsBase
     {
@@ -27,36 +27,36 @@ public virtual string TransformText()
         {
             this.Write("using ");
             
-            #line 2 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options\Options.tt"
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Core.Options;\r\n\r\nnamespace ");
+            this.Write(".Lib.Options.Abstraction;\r\n\r\nnamespace ");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options\Options.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options\Options.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
-            this.Write(".Infrastructure.Options\r\n{\r\n    /// <summary>\r\n    /// ");
+            this.Write(".Infrastructure\r\n{\r\n    /// <summary>\r\n    /// ");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options\Options.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Name));
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Name));
             
             #line default
             #line hidden
             this.Write("配置项\r\n    /// </summary>\r\n    public class ");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options\Options.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt
new file mode 100644
index 0000000..de4ec53
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt
@@ -0,0 +1,13 @@
+<#@ template language="C#" #>
+using <#= _prefix #>.Lib.Options.Abstraction;
+
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Infrastructure
+{
+    /// <summary>
+    /// <#= _model.Module.Name #>配置项
+    /// </summary>
+    public class <#= _model.Module.Code #>Options : IModuleOptions
+    {
+
+    }
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.Extend.cs
deleted file mode 100644
index 9067f3d..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.Extend.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Infrastructure.Options
-{
-    public partial class ModuleOptionsConfigure : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-        private readonly string _prefix;
-
-        public ModuleOptionsConfigure(TemplateBuildModel model)
-        {
-            _model = model;
-            _prefix = model.Project.Prefix;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure/Options");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-            var filePath = Path.Combine(dir, "ModuleOptionsConfigure.cs");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.cs
deleted file mode 100644
index 05787ae..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.cs
+++ /dev/null
@@ -1,338 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本: 16.0.0.0
-//  
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Infrastructure.Options
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options\ModuleOptionsConfigure.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class ModuleOptionsConfigure : ModuleOptionsConfigureBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("using Microsoft.Extensions.Configuration;\r\nusing Microsoft.Extensions.DependencyI" +
-                    "njection;\r\nusing ");
-            
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options\ModuleOptionsConfigure.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
-            
-            #line default
-            #line hidden
-            this.Write(".Lib.Utils.Core.Options;\r\n\r\nnamespace ");
-            
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options\ModuleOptionsConfigure.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
-            
-            #line default
-            #line hidden
-            this.Write(".Module.");
-            
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options\ModuleOptionsConfigure.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
-            
-            #line default
-            #line hidden
-            this.Write(".Infrastructure.Options\r\n{\r\n    public class ModuleOptionsConfigure : IModuleOpti" +
-                    "onsConfigure\r\n    {\r\n        public void ConfigOptions(IServiceCollection servic" +
-                    "es, IConfiguration configuration)\r\n        {\r\n            services.Configure<");
-            
-            #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options\ModuleOptionsConfigure.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
-            
-            #line default
-            #line hidden
-            this.Write("Options>(configuration);\r\n        }\r\n    }\r\n}\r\n");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class ModuleOptionsConfigureBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.tt
deleted file mode 100644
index 09c078e..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/ModuleOptionsConfigure.tt
+++ /dev/null
@@ -1,15 +0,0 @@
-<#@ template language="C#" #>
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using <#= _prefix #>.Lib.Utils.Core.Options;
-
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Infrastructure.Options
-{
-    public class ModuleOptionsConfigure : IModuleOptionsConfigure
-    {
-        public void ConfigOptions(IServiceCollection services, IConfiguration configuration)
-        {
-            services.Configure<<#= _model.Project.Code #>Options>(configuration);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.tt
deleted file mode 100644
index ca12973..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options/Options.tt
+++ /dev/null
@@ -1,13 +0,0 @@
-<#@ template language="C#" #>
-using <#= _prefix #>.Lib.Utils.Core.Options;
-
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Infrastructure.Options
-{
-    /// <summary>
-    /// <#= _model.Project.Name #>配置项
-    /// </summary>
-    public class <#= _model.Project.Code #>Options : IModuleOptions
-    {
-
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.Extend.cs
index dc9283b..7c4b963 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.Extend.cs
@@ -11,7 +11,7 @@ public partial class DbContext : ITemplateHandler
         public DbContext(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
         
         public bool IsGlobal => true;
@@ -23,7 +23,7 @@ public void Save()
                 Directory.CreateDirectory(dir);
 
             var content = TransformText();
-            var filePath = Path.Combine(dir, $"{_model.Project.Code}DbContext.cs");
+            var filePath = Path.Combine(dir, $"{_model.Module.Code}DbContext.cs");
             File.WriteAllText(filePath, content);
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.cs
index 846bc7f..08a1a55 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.cs
@@ -49,21 +49,21 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Infrastructure.Repositories\r\n{\r\n    public class ");
             
             #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write("DbContext : DbContext\r\n    {\r\n        public ");
             
             #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.tt
index 81874de..bb3c525 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.tt
@@ -3,11 +3,11 @@ using System;
 using <#= _prefix #>.Lib.Data.Abstractions;
 using <#= _prefix #>.Lib.Data.Core;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Infrastructure.Repositories
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Infrastructure.Repositories
 {
-    public class <#= _model.Project.Code #>DbContext : DbContext
+    public class <#= _model.Module.Code #>DbContext : DbContext
     {
-        public <#= _model.Project.Code #>DbContext(IDbContextOptions options, IServiceProvider serviceProvider) : base(options, serviceProvider)
+        public <#= _model.Module.Code #>DbContext(IDbContextOptions options, IServiceProvider serviceProvider) : base(options, serviceProvider)
         {
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.Extend.cs
index c223760..0043fb5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.Extend.cs
@@ -13,7 +13,7 @@ public partial class MySqlRepository : ITemplateHandler
         public MySqlRepository(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => false;
@@ -24,9 +24,9 @@ public void Save()
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.cs
index 9e7cd00..b52bab0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.cs
@@ -42,7 +42,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.tt
index a1b8274..dd843ac 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/MySqlRepository.tt
@@ -1,7 +1,7 @@
 <#@ template language="C#" #>
 using <#= _prefix #>.Lib.Data.Abstractions;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Infrastructure.Repositories.MySql
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Infrastructure.Repositories.MySql
 {
     public class <#= _class.Name #>Repository : SqlServer.<#= _class.Name #>Repository
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs
index 1750b6c..e5ddfb7 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs
@@ -16,7 +16,7 @@ public partial class PostgreSQLRepository : ITemplateHandler
         public PostgreSQLRepository(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
         
         public bool IsGlobal => false;
@@ -27,9 +27,9 @@ public void Save()
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.cs
index 567d8d7..0422680 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.cs
@@ -42,7 +42,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.tt
index 875284d..2fbd07e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.tt
@@ -1,7 +1,7 @@
 <#@ template language="C#" #>
     using <#= _prefix #>.Lib.Data.Abstractions;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Infrastructure.Repositories.PostgreSQL
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Infrastructure.Repositories.PostgreSQL
 {
     public class <#= _class.Name #>Repository : SqlServer.<#= _class.Name #>Repository
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.Extend.cs
index f6966f5..26556fe 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.Extend.cs
@@ -13,7 +13,7 @@ public partial class SQLiteRepository : ITemplateHandler
         public SQLiteRepository(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => false;
@@ -24,9 +24,9 @@ public void Save()
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.cs
index 02f65cd..9d942bd 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.cs
@@ -42,7 +42,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.tt
index 0a18027..aa81377 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.tt
@@ -1,7 +1,7 @@
 <#@ template language="C#" #>
 using <#= _prefix #>.Lib.Data.Abstractions;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Infrastructure.Repositories.SQLite
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Infrastructure.Repositories.SQLite
 {
     public class <#= _class.Name #>Repository : SqlServer.<#= _class.Name #>Repository
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.Extend.cs
index bbbb681..a28bf24 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.Extend.cs
@@ -13,7 +13,7 @@ public partial class SqlServerRepository : ITemplateHandler
         public SqlServerRepository(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => false;
@@ -24,9 +24,9 @@ public void Save()
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.cs
index 905bfce..8a8794e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.cs
@@ -78,7 +78,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
@@ -99,7 +99,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
@@ -120,7 +120,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.tt
index 4e5b718..a0bcaf4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.tt
@@ -8,10 +8,10 @@ using <#= _prefix #>.Lib.Data.Query;
 <# if(_class.IsEntityBase){ #>
 using <#= _prefix #>.Module.Admin.Domain.Account;
 <# } #>
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>.Models;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>.Models;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Infrastructure.Repositories.SqlServer
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Infrastructure.Repositories.SqlServer
 {
     public class <#= _class.Name #>Repository : RepositoryAbstract<<#= _class.Name #>Entity>, I<#= _class.Name #>Repository
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.Extend.cs
index a50e26e..b8b3064 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.Extend.cs
@@ -16,7 +16,7 @@ public BabelConfig(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.Extend.cs
index a95153d..86451d0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.Extend.cs
@@ -16,7 +16,7 @@ public Browserslistrc(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.cs
index 423a2a0..ae273ab 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.cs
@@ -25,7 +25,7 @@ public partial class Browserslistrc : BrowserslistrcBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("> 1%\r\nlast 2 versions\r\nnot ie <= 11\r\n");
+            this.Write("> 1%\r\nlast 2 versions");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.tt
index 5e63217..2061d50 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Browserslistrc.tt
@@ -1,4 +1,3 @@
 <#@ template language="C#" #>
 > 1%
-last 2 versions
-not ie <= 11
+last 2 versions
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.Extend.cs
index b8d9766..7867c83 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.Extend.cs
@@ -16,7 +16,7 @@ public Eslintrc(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.Extend.cs
index f028115..25bd489 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.Extend.cs
@@ -11,14 +11,14 @@ public partial class Package : ITemplateHandler
         public Package(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = _model.Project.Prefix.ToLower();
+            _prefix = _model.Module.Prefix.ToLower();
         }
 
         public bool IsGlobal => true;
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
index b8d7d7c..87b44a3 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
@@ -36,28 +36,28 @@ public virtual string TransformText()
             this.Write("-module-");
             
             #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.ToLower()));
             
             #line default
             #line hidden
             this.Write("\",\r\n  \"version\": \"1.0.0\",\r\n  \"code\": \"");
             
             #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.FirstCharToLower()));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.FirstCharToLower()));
             
             #line default
             #line hidden
             this.Write("\",\r\n  \"title\": \"");
             
             #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Name));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Name));
             
             #line default
             #line hidden
             this.Write("\",\r\n  \"description\": \"");
             
             #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Name));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Name));
             
             #line default
             #line hidden
@@ -75,15 +75,15 @@ public virtual string TransformText()
     ""pub"": ""cd ../../../script && npm_publish.ps1""
   },
   ""dependencies"": {
-    ""netmodular-module-admin"": ""^1.1.4"",
-    ""netmodular-ui"": ""^1.3.3""
+    ""netmodular-module-admin"": ""^1.1.9"",
+    ""netmodular-ui"": ""^1.4.6""
   },
   ""devDependencies"": {
-    ""@vue/cli-plugin-babel"": ""^4.1.1"",
-    ""@vue/cli-plugin-eslint"": ""^4.1.1"",
-    ""@vue/cli-plugin-router"": ""^4.1.1"",
-    ""@vue/cli-plugin-vuex"": ""^4.1.1"",
-    ""@vue/cli-service"": ""^4.1.1"",
+    ""@vue/cli-plugin-babel"": ""^4.2.2"",
+    ""@vue/cli-plugin-eslint"": ""^4.2.2"",
+    ""@vue/cli-plugin-router"": ""^4.2.2"",
+    ""@vue/cli-plugin-vuex"": ""^4.2.2"",
+    ""@vue/cli-service"": ""^4.2.2"",
     ""@vue/eslint-config-prettier"": ""^5.0.0"",
     ""babel-eslint"": ""^10.0.3"",
     ""eslint"": ""^5.16.0"",
@@ -91,9 +91,9 @@ public virtual string TransformText()
     ""eslint-plugin-vue"": ""^5.0.0"",
     ""prettier"": ""^1.18.2"",
     ""raw-loader"": ""^3.1.0"",
-    ""rimraf"": ""^3.0.0"",
-    ""sass"": ""^1.22.10"",
-    ""sass-loader"": ""^8.0.0"",
+    ""rimraf"": ""^3.0.1"",
+    ""sass"": ""^1.25.0"",
+    ""sass-loader"": ""^8.0.2"",
     ""vue-template-compiler"": ""^2.6.11""
   }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
index 2ff85c0..a65f47d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
@@ -1,11 +1,11 @@
 <#@ template language="C#" #>
 <#@ import namespace="NetModular.Lib.Utils.Core.Extensions" #>
 {
-  "name": "<#= _prefix #>-module-<#= _model.Project.Code.ToLower() #>",
+  "name": "<#= _prefix #>-module-<#= _model.Module.Code.ToLower() #>",
   "version": "1.0.0",
-  "code": "<#= _model.Project.Code.FirstCharToLower() #>",
-  "title": "<#= _model.Project.Name #>",
-  "description": "<#= _model.Project.Name #>",
+  "code": "<#= _model.Module.Code.FirstCharToLower() #>",
+  "title": "<#= _model.Module.Name #>",
+  "description": "<#= _model.Module.Name #>",
   "main": "src/index.js",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -19,15 +19,15 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.1.4",
-    "netmodular-ui": "^1.3.3"
+    "netmodular-module-admin": "^1.1.9",
+    "netmodular-ui": "^1.4.6"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.1.1",
-    "@vue/cli-plugin-eslint": "^4.1.1",
-    "@vue/cli-plugin-router": "^4.1.1",
-    "@vue/cli-plugin-vuex": "^4.1.1",
-    "@vue/cli-service": "^4.1.1",
+    "@vue/cli-plugin-babel": "^4.2.2",
+    "@vue/cli-plugin-eslint": "^4.2.2",
+    "@vue/cli-plugin-router": "^4.2.2",
+    "@vue/cli-plugin-vuex": "^4.2.2",
+    "@vue/cli-service": "^4.2.2",
     "@vue/eslint-config-prettier": "^5.0.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^5.16.0",
@@ -35,9 +35,9 @@
     "eslint-plugin-vue": "^5.0.0",
     "prettier": "^1.18.2",
     "raw-loader": "^3.1.0",
-    "rimraf": "^3.0.0",
-    "sass": "^1.22.10",
-    "sass-loader": "^8.0.0",
+    "rimraf": "^3.0.1",
+    "sass": "^1.25.0",
+    "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.11"
   }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.Extend.cs
index 1035b89..f1e0bf1 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/PostcssConfig.Extend.cs
@@ -16,7 +16,7 @@ public PostcssConfig(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.Extend.cs
index 91bd69f..db2f691 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Prettierrc.Extend.cs
@@ -16,7 +16,7 @@ public Prettierrc(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.Extend.cs
index 9de7174..1a24794 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.Extend.cs
@@ -11,14 +11,14 @@ public partial class VueConfig : ITemplateHandler
         public VueConfig(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = _model.Project.Prefix.ToLower();
+            _prefix = _model.Module.Prefix.ToLower();
         }
 
         public bool IsGlobal => true;
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
index 34fdc2b..35380b6 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
@@ -31,23 +31,24 @@ public virtual string TransformText()
                     "YRIGHT = \'");
             
             #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Copyright));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Copyright));
             
             #line default
             #line hidden
             this.Write("\'\r\nprocess.env.VUE_APP_BUILD_TIME = require(\'dayjs\')().format(\'YYYYMDHHmmss\')\r\n//" +
                     " ������·��\r\nconst outputDir = \'../../WebHost/wwwroot/app\'\r\n\r\nmodule.exports = {\r\n  " +
-                    "outputDir: outputDir,\r\n  publicPath: \'/app\',\r\n  devServer: {\r\n    port: ");
+                    "devServer: {\r\n    port: ");
             
-            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.No + 5220));
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.No + 5220));
             
             #line default
             #line hidden
-            this.Write("\r\n  },\r\n  configureWebpack() {\r\n    let config = {\r\n      plugins: [\r\n        /**" +
-                    "\r\n         * ����");
+            this.Write("\r\n  },\r\n  outputDir: outputDir,\r\n  publicPath: \'/app\',\r\n  transpileDependencies: " +
+                    "[\'netmodular.*\', \'element-ui\'],\r\n  configureWebpack() {\r\n    let config = {\r\n   " +
+                    "   plugins: [\r\n        /**\r\n         * ����");
             
-            #line 23 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 24 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -55,7 +56,7 @@ public virtual string TransformText()
             this.Write("-ui/publicĿ¼�µ��ļ������Ŀ¼\r\n         */\r\n        new CopyWebpackPlugin([\r\n          {\r" +
                     "\n            from: path.join(__dirname, \'node_modules/");
             
-            #line 27 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 28 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -101,7 +102,7 @@ public virtual string TransformText()
     /**
      * ����index.htmlģ��·����ʹ��");
             
-            #line 66 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 67 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -109,7 +110,7 @@ public virtual string TransformText()
             this.Write("-ui/public�е�ģ��\r\n     */\r\n    config.plugin(\'html\').tap(args => {\r\n      args[0].t" +
                     "emplate = \'./node_modules/");
             
-            #line 69 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 70 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -140,14 +141,14 @@ public virtual string TransformText()
             skins: {
               name: 'chunk-");
             
-            #line 93 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 94 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write("-ui\',\r\n              priority: 10,\r\n              test: /[\\\\/]node_modules[\\\\/]");
             
-            #line 95 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 96 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
index 0b40027..d49c02e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
@@ -5,17 +5,18 @@ const TerserPlugin = require('terser-webpack-plugin')
 const isDev = process.env.NODE_ENV === 'development' // 开发环境
 
 // 增加环境变量
-process.env.VUE_APP_COPYRIGHT = '<#= _model.Project.Copyright #>'
+process.env.VUE_APP_COPYRIGHT = '<#= _model.Module.Copyright #>'
 process.env.VUE_APP_BUILD_TIME = require('dayjs')().format('YYYYMDHHmmss')
 // 打包输出路径
 const outputDir = '../../WebHost/wwwroot/app'
 
 module.exports = {
-  outputDir: outputDir,
-  publicPath: '/app',
   devServer: {
-    port: <#= _model.Project.No + 5220 #>
+    port: <#= _model.Module.No + 5220 #>
   },
+  outputDir: outputDir,
+  publicPath: '/app',
+  transpileDependencies: ['netmodular.*', 'element-ui'],
   configureWebpack() {
     let config = {
       plugins: [
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.Extend.cs
index 89f6556..347c128 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.Extend.cs
@@ -16,7 +16,7 @@ public Index(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/src");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.Extend.cs
index 0b293b6..0ca0fd9 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.Extend.cs
@@ -11,14 +11,14 @@ public partial class Main : ITemplateHandler
         public Main(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = _model.Project.Prefix.ToLower();
+            _prefix = _model.Module.Prefix.ToLower();
         }
 
         public bool IsGlobal => true;
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/src");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.cs
index f7aac86..bef627e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.cs
@@ -35,14 +35,14 @@ public virtual string TransformText()
             this.Write("-module-admin\'\r\nimport config from \'./config\'\r\nimport ");
             
             #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Main.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(" from \'./index\'\r\n\r\n// ע��ģ��\r\nWebHost.registerModule(");
             
             #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Main.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.tt
index b3a9b9d..9a7f8df 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.tt
@@ -1,10 +1,10 @@
 <#@ template language="C#" #>
 import WebHost from '<#= _prefix #>-module-admin'
 import config from './config'
-import <#= _model.Project.Code #> from './index'
+import <#= _model.Module.Code #> from './index'
 
 // 注入模块
-WebHost.registerModule(<#= _model.Project.Code #>)
+WebHost.registerModule(<#= _model.Module.Code #>)
 
 // 启动
 WebHost.start(config)
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.Extend.cs
index 9c014a8..2e52fa4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.Extend.cs
@@ -16,7 +16,7 @@ public Module(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/src");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.Extend.cs
index badb2dd..e83ad64 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.Extend.cs
@@ -16,7 +16,7 @@ public Index(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/api");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/src/api");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs
index c79716d..4d9ba2f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs
@@ -20,14 +20,14 @@ public Entity(TemplateBuildModel model)
         public void Save()
         {
             var dir = Path.Combine(_model.RootPath,
-                $"src/UI/{_model.Project.WebUIDicName}/src/api/components");
+                $"src/UI/{_model.Module.WebUIDicName}/src/api/components");
 
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
index 9ffb085..156e92c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
@@ -12,15 +12,15 @@ public partial class Components : ITemplateHandler
         public Components(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = _model.Project.Prefix.ToLower();
-            _uiPrefix = _model.Project.UIPrefix.ToLower();
+            _prefix = _model.Module.Prefix.ToLower();
+            _uiPrefix = _model.Module.UiPrefix.ToLower();
         }
 
         public bool IsGlobal => true;
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/components");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/src/components");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.Extend.cs
index 91c011d..d3d13a4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.Extend.cs
@@ -16,7 +16,7 @@ public Config(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/config");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/src/config");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.cs
index b90a98e..745ac5c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.cs
@@ -29,7 +29,7 @@ public virtual string TransformText()
                     "l: \'/api/\'\r\n}\r\n\r\n// ����ģʽ\r\nif (isDev) {\r\n  config.baseUrl = \'http://localhost:");
             
             #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\config\Config.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(6220 + _model.Project.No));
+            this.Write(this.ToStringHelper.ToStringWithCulture(6220 + _model.Module.No));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.Extend.cs
index 9ee83f0..f2ee5f8 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/routes/Routes.Extend.cs
@@ -11,14 +11,14 @@ public partial class Routes : ITemplateHandler
         public Routes(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = _model.Project.Prefix.ToLower();
+            _prefix = _model.Module.Prefix.ToLower();
         }
 
         public bool IsGlobal => true;
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/routes");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/src/routes");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.Extend.cs
index 34fe76a..abb29e4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.Extend.cs
@@ -16,7 +16,7 @@ public Store(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/store");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/src/store");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs
index b8f929c..6bfc88f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs
@@ -15,21 +15,21 @@ public partial class SavePage : ITemplateHandler
         public SavePage(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = _model.Project.Prefix.ToLower();
-            _uiPrefix = _model.Project.UIPrefix.ToLower();
+            _prefix = _model.Module.Prefix.ToLower();
+            _uiPrefix = _model.Module.UiPrefix.ToLower();
         }
 
         public bool IsGlobal => false;
 
         public void Save()
         {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "components/save");
+                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "components/save");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.cs
index eb0be51..f4c0db0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.cs
@@ -34,7 +34,7 @@ public virtual string TransformText()
             #line default
             #line hidden
             this.Write("-form-dialog ref=\"form\" v-bind=\"form\" v-on=\"on\" :visible.sync=\"visible_\">\r\n    <e" +
-                    "l-row>\r\n      <el-col :span=\"20\" :offset=\"1\">\r\n      ");
+                    "l-row>\r\n      <el-col :span=\"20\" :offset=\"1\">\r\n");
             
             #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
     foreach(var p in _class.EditModelPropertyList){ 
@@ -62,7 +62,7 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("\" clearable />\r\n        </el-form-item>\r\n      ");
+            this.Write("\" clearable />\r\n        </el-form-item>\r\n");
             
             #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
     } 
@@ -86,7 +86,7 @@ public virtual string TransformText()
             this.Write("-ui\'\r\n\r\nconst { add, edit, update } = $api.");
             
             #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.FirstCharToLower()));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.FirstCharToLower()));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.tt
index 338d7cc..2283af9 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.tt
@@ -4,11 +4,11 @@
   <<#= _uiPrefix #>-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
     <el-row>
       <el-col :span="20" :offset="1">
-      <#    foreach(var p in _class.EditModelPropertyList){ #>
+<#    foreach(var p in _class.EditModelPropertyList){ #>
         <el-form-item label="<#= p.Remarks #>：" prop="<#= p.CamelName #>">
           <el-input v-model="form.model.<#= p.CamelName #>" clearable />
         </el-form-item>
-      <#    } #>
+<#    } #>
       </el-col>
     </el-row>
   </<#= _uiPrefix #>-form-dialog>
@@ -16,7 +16,7 @@
 <script>
 import { mixins } from '<#= _prefix.ToLower() #>-ui'
 
-const { add, edit, update } = $api.<#= _model.Project.Code.FirstCharToLower() #>.<#= _class.Name.FirstCharToLower() #>
+const { add, edit, update } = $api.<#= _model.Module.Code.FirstCharToLower() #>.<#= _class.Name.FirstCharToLower() #>
 
 export default {
   mixins: [mixins.formSave],
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs
index e6d970b..746d881 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs
@@ -21,13 +21,13 @@ public Cols(TemplateBuildModel model)
 
         public void Save()
         {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
                     _properties = _class.PropertyList.Where(m => m.ShowInList).ToList();
-                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "index");
+                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "index");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
index d16647b..5c4decb 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
@@ -14,20 +14,20 @@ public partial class Index : ITemplateHandler
         public Index(TemplateBuildModel model)
         {
             _model = model;
-            _uiPrefix = _model.Project.UIPrefix.ToLower();
+            _uiPrefix = _model.Module.UiPrefix.ToLower();
         }
 
         public bool IsGlobal => false;
 
         public void Save()
         {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "index");
+                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "index");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
index 96f1ab5..5b06ad5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
@@ -41,14 +41,14 @@ public virtual string TransformText()
             #line default
             #line hidden
             this.Write("-list ref=\"list\" v-bind=\"list\">\r\n      <!--��ѯ����-->\r\n      <template v-slot:queryb" +
-                    "ar> \r\n        ");
+                    "ar>\r\n");
             
             #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
  foreach(var p in _class.QueryModelPropertyList){ 
             
             #line default
             #line hidden
-            this.Write("          <el-form-item label=\"");
+            this.Write("        <el-form-item label=\"");
             
             #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
@@ -62,14 +62,14 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("\">\r\n            <el-input v-model=\"list.model.");
+            this.Write("\">\r\n          <el-input v-model=\"list.model.");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
-            this.Write("\" clearable />\r\n          </el-form-item>\r\n        ");
+            this.Write("\" clearable />\r\n        </el-form-item>\r\n");
             
             #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
     } 
@@ -128,7 +128,7 @@ public virtual string TransformText()
                     "ents/save\'\r\n\r\nconst api = $api.");
             
             #line 41 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.FirstCharToLower()));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.FirstCharToLower()));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
index 69cebea..6300a33 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
@@ -4,12 +4,12 @@
   <<#= _uiPrefix #>-container>
     <<#= _uiPrefix #>-list ref="list" v-bind="list">
       <!--查询条件-->
-      <template v-slot:querybar> 
-        <# foreach(var p in _class.QueryModelPropertyList){ #>
-          <el-form-item label="<#= p.Remarks #>：" prop="<#= p.CamelName #>">
-            <el-input v-model="list.model.<#= p.CamelName #>" clearable />
-          </el-form-item>
-        <#    } #>
+      <template v-slot:querybar>
+<# foreach(var p in _class.QueryModelPropertyList){ #>
+        <el-form-item label="<#= p.Remarks #>：" prop="<#= p.CamelName #>">
+          <el-input v-model="list.model.<#= p.CamelName #>" clearable />
+        </el-form-item>
+<#    } #>
       </template>
 
       <!--按钮-->
@@ -38,7 +38,7 @@ import page from './page'
 import cols from './cols'
 import SavePage from '../components/save'
 
-const api = $api.<#= _model.Project.Code.FirstCharToLower() #>.<#= _class.Name.FirstCharToLower() #>
+const api = $api.<#= _model.Module.Code.FirstCharToLower() #>.<#= _class.Name.FirstCharToLower() #>
 
 export default {
   name: page.name,
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs
index e91c5e4..d82068d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs
@@ -19,13 +19,13 @@ public Page(TemplateBuildModel model)
 
         public void Save()
         {
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
-                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "index");
+                    var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/src/views", _class.Name.FirstCharToLower(), "index");
                     if (!Directory.Exists(dir))
                         Directory.CreateDirectory(dir);
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.cs
index 5f45264..46f4b25 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.cs
@@ -32,30 +32,37 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("�б�\'\r\n  this.name = \'");
+            this.Write("�б�\'\r\n  this.icon = \'");
             
             #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_class.MenuIcon));
+            
+            #line default
+            #line hidden
+            this.Write("\'\r\n  this.name = \'");
+            
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.ToLower()));
             
             #line default
             #line hidden
             this.Write("_");
             
-            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name.ToLower()));
             
             #line default
             #line hidden
             this.Write("\'\r\n  this.path = \'/");
             
-            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code.ToLower()));
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.ToLower()));
             
             #line default
             #line hidden
             this.Write("/");
             
-            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name.ToLower()));
             
             #line default
@@ -96,14 +103,14 @@ public virtual string TransformText()
   page,
   component: () => import(/* webpackChunkName: """);
             
-            #line 40 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 41 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".");
             
-            #line 40 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
+            #line 41 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Page.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.tt
index 73a3058..f544764 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.tt
@@ -2,8 +2,9 @@
 /** 页面信息 */
 const page = new (function() {
   this.title = '<#= _class.Remarks #>列表'
-  this.name = '<#= _model.Project.Code.ToLower() #>_<#= _class.Name.ToLower() #>'
-  this.path = '/<#= _model.Project.Code.ToLower() #>/<#= _class.Name.ToLower() #>'
+  this.icon = '<#= _class.MenuIcon #>'
+  this.name = '<#= _model.Module.Code.ToLower() #>_<#= _class.Name.ToLower() #>'
+  this.path = '/<#= _model.Module.Code.ToLower() #>/<#= _class.Name.ToLower() #>'
 
   // 关联权限
   this.permissions = [`${this.name}_query_get`]
@@ -37,7 +38,7 @@ const page = new (function() {
 /** 路由信息 */
 export const route = {
   page,
-  component: () => import(/* webpackChunkName: "<#= _model.Project.Code #>.<#= _class.Name #>" */ './index')
+  component: () => import(/* webpackChunkName: "<#= _model.Module.Code #>.<#= _class.Name #>" */ './index')
 }
 
 export default page
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.Extend.cs
index 6617914..7292b3d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/vscode/settings.Extend.cs
@@ -17,7 +17,7 @@ public settings(TemplateBuildModel model)
         public void Save()
         {
             var content = TransformText();
-            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Project.WebUIDicName}/.vscode");
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/.vscode");
             if (!Directory.Exists(dir))
             {
                 Directory.CreateDirectory(dir);
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.Extend.cs
index b6d8f19..97d705e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.Extend.cs
@@ -13,7 +13,7 @@ public partial class Controller : ITemplateHandler
         public Controller(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => false;
@@ -24,9 +24,9 @@ public void Save()
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
-            if (_model.Project.ClassList != null && _model.Project.ClassList.Any())
+            if (_model.Module.ClassList != null && _model.Module.ClassList.Any())
             {
-                foreach (var classModel in _model.Project.ClassList)
+                foreach (var classModel in _model.Module.ClassList)
                 {
                     _class = classModel;
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.cs
index e5492c9..b4cff80 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Controller : ControllerBase
     {
@@ -29,126 +29,126 @@ public virtual string TransformText()
                     " Microsoft.AspNetCore.Mvc;\r\nusing Microsoft.AspNetCore.Mvc.ModelBinding;\r\nusing " +
                     "");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Utils.Core.Result;\r\nusing ");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Application.");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service;\r\nusing ");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Application.");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service.ViewModels;\r\nusing ");
             
-            #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write(".Models;\r\n\r\nnamespace ");
             
-            #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Web.Controllers\r\n{\r\n    [Description(\"");
             
-            #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Remarks));
             
             #line default
             #line hidden
             this.Write("管理\")]\r\n    public class ");
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Controller : ModuleController\r\n    {\r\n        private readonly I");
             
-            #line 17 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service _service;\r\n\r\n        public ");
             
-            #line 19 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Controller(I");
             
-            #line 19 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service service)\r\n        {\r\n            _service = service;\r\n        }\r\n\r\n");
             
-            #line 24 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 24 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
  if(_class.Method.Query) {
             
             #line default
@@ -156,7 +156,7 @@ public virtual string TransformText()
             this.Write("        [HttpGet]\r\n        [Description(\"查询\")]\r\n        public Task<IResultModel>" +
                     " Query([FromQuery]");
             
-            #line 27 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 27 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
@@ -164,13 +164,13 @@ public virtual string TransformText()
             this.Write("QueryModel model)\r\n        {\r\n            return _service.Query(model);\r\n        " +
                     "}\r\n\r\n");
             
-            #line 32 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 32 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
 } 
             
             #line default
             #line hidden
             
-            #line 33 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 33 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
  if(_class.Method.Add) {
             
             #line default
@@ -178,7 +178,7 @@ public virtual string TransformText()
             this.Write("        [HttpPost]\r\n        [Description(\"添加\")]\r\n        public Task<IResultModel" +
                     "> Add(");
             
-            #line 36 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 36 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
@@ -186,13 +186,13 @@ public virtual string TransformText()
             this.Write("AddModel model)\r\n        {\r\n            return _service.Add(model);\r\n        }\r\n\r" +
                     "\n");
             
-            #line 41 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 41 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
 } 
             
             #line default
             #line hidden
             
-            #line 42 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 42 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
  if(_class.Method.Delete) {
             
             #line default
@@ -200,20 +200,20 @@ public virtual string TransformText()
             this.Write("        [HttpDelete]\r\n        [Description(\"删除\")]\r\n        public Task<IResultMod" +
                     "el> Delete([BindRequired]");
             
-            #line 45 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 45 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.PrimaryKeyTypeName));
             
             #line default
             #line hidden
             this.Write(" id)\r\n        {\r\n            return _service.Delete(id);\r\n        }\r\n\r\n");
             
-            #line 50 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 50 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
 } 
             
             #line default
             #line hidden
             
-            #line 51 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 51 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
  if(_class.Method.Edit) {
             
             #line default
@@ -221,7 +221,7 @@ public virtual string TransformText()
             this.Write("        [HttpGet]\r\n        [Description(\"编辑\")]\r\n        public Task<IResultModel>" +
                     " Edit([BindRequired]");
             
-            #line 54 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 54 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.PrimaryKeyTypeName));
             
             #line default
@@ -229,7 +229,7 @@ public virtual string TransformText()
             this.Write(" id)\r\n        {\r\n            return _service.Edit(id);\r\n        }\r\n\r\n        [Htt" +
                     "pPost]\r\n        [Description(\"修改\")]\r\n        public Task<IResultModel> Update(");
             
-            #line 61 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 61 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
@@ -237,7 +237,7 @@ public virtual string TransformText()
             this.Write("UpdateModel model)\r\n        {\r\n            return _service.Update(model);\r\n      " +
                     "  }\r\n");
             
-            #line 65 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
+            #line 65 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Controllers\Controller.tt"
 } 
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.tt
index e964f39..6d7eab4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Controllers/Controller.tt
@@ -5,11 +5,11 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using <#= _prefix #>.Lib.Utils.Core.Result;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Application.<#= _class.Name #>Service;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Application.<#= _class.Name #>Service.ViewModels;
-using <#= _prefix #>.Module.<#= _model.Project.Code #>.Domain.<#= _class.Name #>.Models;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Application.<#= _class.Name #>Service;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Application.<#= _class.Name #>Service.ViewModels;
+using <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>.Models;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Web.Controllers
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Web.Controllers
 {
     [Description("<#= _class.Remarks #>管理")]
     public class <#= _class.Name #>Controller : ModuleController
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs
index 5dd0c8a..00bd753 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs
@@ -11,7 +11,7 @@ public partial class Csproj : ITemplateHandler
         public Csproj(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
index ad72b29..fa20630 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
@@ -25,45 +25,55 @@ public partial class Csproj : CsprojBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write(@"<Project Sdk=""Microsoft.NET.Sdk"">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-	<PackageReference Include=""");
+            this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n  <PropertyGroup>\r\n    <TargetFramework>netc" +
+                    "oreapp3.1</TargetFramework>\r\n    <GenerateDocumentationFile>false</GenerateDocum" +
+                    "entationFile>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n\t<PackageReference Include=\"" +
+                    "");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Auth.Web\" Version=\"1.5.4\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Auth.Web\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
             
             #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Module.AspNetCore\" Version=\"1.5.2\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Module.AspNetCore\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
             
             #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Mvc\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Utils.Mvc\" Version=\"1.7.1\" />\r\n    <PackageReference Include=\"");
             
             #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Validation.FluentValidation\" Version=\"1.5.1\" />\r\n  </ItemGroup>\r\n\r\n  <ItemGr" +
-                    "oup>\r\n    <ProjectReference Include=\"..\\Library\\Application\\Application.csproj\" " +
-                    "/>\r\n  </ItemGroup>\r\n\r\n</Project>\r\n");
+            this.Write(@".Lib.Validation.FluentValidation"" Version=""1.7.0"" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include=""..\Library\Application\Application.csproj"" />
+  </ItemGroup>
+  
+  <!--打包模块相关文件到NuGet包中，此功能需要编译两次项目才行，因为打包操作在创建_module.json文件之前执行的-->
+  <ItemGroup>
+    <Content Include=""$(SolutionDir)\src\WebHost\_modules*\**\*.*"" PackagePath=""contentFiles\any\any"">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+</Project>
+");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
index a09579e..51ea946 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
@@ -2,19 +2,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="<#= _prefix #>.Lib.Auth.Web" Version="1.5.4" />
-    <PackageReference Include="<#= _prefix #>.Lib.Module.AspNetCore" Version="1.5.2" />
-    <PackageReference Include="<#= _prefix #>.Lib.Utils.Mvc" Version="1.5.9" />
-    <PackageReference Include="<#= _prefix #>.Lib.Validation.FluentValidation" Version="1.5.1" />
+	<PackageReference Include="<#= _prefix #>.Lib.Auth.Web" Version="1.7.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Module.AspNetCore" Version="1.7.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Utils.Mvc" Version="1.7.1" />
+    <PackageReference Include="<#= _prefix #>.Lib.Validation.FluentValidation" Version="1.7.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Library\Application\Application.csproj" />
   </ItemGroup>
+  
+  <!--打包模块相关文件到NuGet包中，此功能需要编译两次项目才行，因为打包操作在创建_module.json文件之前执行的-->
+  <ItemGroup>
+    <Content Include="$(SolutionDir)\src\WebHost\_modules*\**\*.*" PackagePath="contentFiles\any\any">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.Extend.cs
index 5bb68a4..0b87953 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.Extend.cs
@@ -11,7 +11,7 @@ public partial class ModuleController : ITemplateHandler
         public ModuleController(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.cs
index 95d7587..f184d0b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.cs
@@ -42,14 +42,14 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleController.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Web\r\n{\r\n    [Area(\"");
             
             #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleController.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.tt
index 5735ebb..382db2f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.tt
@@ -2,9 +2,9 @@
 using Microsoft.AspNetCore.Mvc;
 using <#= _prefix #>.Lib.Auth.Web;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Web
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Web
 {
-    [Area("<#= _model.Project.Code #>")]
+    [Area("<#= _model.Module.Code #>")]
     public abstract class ModuleController : ControllerAbstract
     {
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.Extend.cs
index c849093..7bde869 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.Extend.cs
@@ -11,7 +11,7 @@ public partial class ModuleInitializer : ITemplateHandler
         public ModuleInitializer(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
index bc8c261..1c487de 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
@@ -25,27 +25,26 @@ public partial class ModuleInitializer : ModuleInitializerBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("using Microsoft.AspNetCore.Builder;\r\n#if NETSTANDARD2_0\r\nusing Microsoft.AspNetCo" +
-                    "re.Hosting;\r\n#endif\r\nusing Microsoft.AspNetCore.Mvc;\r\nusing Microsoft.Extensions" +
-                    ".DependencyInjection;\r\n#if NETCOREAPP3_1\r\nusing Microsoft.Extensions.Hosting;\r\n#" +
-                    "endif\r\nusing ");
+            this.Write("using Microsoft.AspNetCore.Builder;\r\nusing Microsoft.AspNetCore.Mvc;\r\nusing Micro" +
+                    "soft.Extensions.DependencyInjection;\r\nusing Microsoft.Extensions.Hosting;\r\nusing" +
+                    " ");
             
-            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Module.AspNetCore;\r\n\r\nnamespace ");
             
-            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
@@ -57,11 +56,7 @@ public class ModuleInitializer : IModuleInitializer
         /// 注入服务
         /// </summary>
         /// <param name=""services""></param>
-#if NETSTANDARD2_0
-        public void ConfigureServices(IServiceCollection services, IHostingEnvironment env)
-#elif NETCOREAPP3_1
         public void ConfigureServices(IServiceCollection services, IHostEnvironment env)
-#endif
         {
         }
 
@@ -70,11 +65,7 @@ public void ConfigureServices(IServiceCollection services, IHostEnvironment env)
         /// </summary>
         /// <param name=""app""></param>
         /// <param name=""env""></param>
-#if NETSTANDARD2_0
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
-#elif NETCOREAPP3_1
         public void Configure(IApplicationBuilder app, IHostEnvironment env)
-#endif
         {
         }
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
index a63b3eb..da4ac12 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
@@ -1,16 +1,11 @@
 <#@ template language="C#" #>
 using Microsoft.AspNetCore.Builder;
-#if NETSTANDARD2_0
-using Microsoft.AspNetCore.Hosting;
-#endif
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-#if NETCOREAPP3_1
 using Microsoft.Extensions.Hosting;
-#endif
 using <#= _prefix #>.Lib.Module.AspNetCore;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Web
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Web
 {
     public class ModuleInitializer : IModuleInitializer
     {
@@ -18,11 +13,7 @@ namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Web
         /// 注入服务
         /// </summary>
         /// <param name="services"></param>
-#if NETSTANDARD2_0
-        public void ConfigureServices(IServiceCollection services, IHostingEnvironment env)
-#elif NETCOREAPP3_1
         public void ConfigureServices(IServiceCollection services, IHostEnvironment env)
-#endif
         {
         }
 
@@ -31,11 +22,7 @@ namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.Web
         /// </summary>
         /// <param name="app"></param>
         /// <param name="env"></param>
-#if NETSTANDARD2_0
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
-#elif NETCOREAPP3_1
         public void Configure(IApplicationBuilder app, IHostEnvironment env)
-#endif
         {
         }
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs
index 95cb1d8..2c38241 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs
@@ -11,7 +11,7 @@ public partial class Csproj : ITemplateHandler
         public Csproj(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
index 0708d4a..506f056 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
@@ -25,76 +25,84 @@ public partial class Csproj : CsprojBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("<Project Sdk=\"Microsoft.NET.Sdk.Web\">\r\n\r\n  <PropertyGroup>\r\n    <TargetFramework>" +
-                    "netcoreapp3.1</TargetFramework>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n\t<PackageR" +
-                    "eference Include=\"");
-            
-            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
-            
-            #line default
-            #line hidden
-            this.Write(".Lib.Cache.MemoryCache\" Version=\"1.5.3\" />\r\n    <PackageReference Include=\"");
+            this.Write(@"<Project Sdk=""Microsoft.NET.Sdk.Web"">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <!--复制本地锁定的程序集到输出目录-->
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
+    <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
+  </PropertyGroup>
+
+  <ItemGroup>
+	<PackageReference Include=""");
             
-            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.MySql\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Cache.MemoryCache\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
             
-            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.SQLite\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.MySql\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
             
-            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.SqlServer\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.SQLite\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
             
-            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Excel.EPPlus\" Version=\"1.5.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.SqlServer\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
             
-            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Host.Web\" Version=\"1.5.4\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Excel.EPPlus\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
             
-            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 18 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Core\" Version=\"1.5.9\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Host.Web\" Version=\"1.7.1\" />\r\n    <PackageReference Include=\"");
             
-            #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(@".Module.Admin.Web"" Version=""1.5.11"" />
+            this.Write(@".Module.Admin.Web"" Version=""1.7.1"" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include=""..\Web\Web.csproj"" />
   </ItemGroup>
+  
+  <Import Project=""..\..\build\module.build.targets"" />
 
-  <!--复制配置文件到输出目录-->
   <ItemGroup>
-    <Content Update=""config\**"">
+    <!--复制配置文件到输出目录-->
+    <None Update=""config\**\*.*"">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <!--复制模块相关文件到输出路径中-->
+    <None Update=""_modules\**\*.*"">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
index 2320b7a..1cd5af2 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
@@ -3,28 +3,37 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <!--复制本地锁定的程序集到输出目录-->
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
+    <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="<#= _prefix #>.Lib.Cache.MemoryCache" Version="1.5.3" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.MySql" Version="1.5.9" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.SQLite" Version="1.5.9" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.SqlServer" Version="1.5.9" />
-    <PackageReference Include="<#= _prefix #>.Lib.Excel.EPPlus" Version="1.5.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Host.Web" Version="1.5.4" />
-    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="1.5.9" />
-    <PackageReference Include="<#= _prefix #>.Module.Admin.Web" Version="1.5.11" />
+	<PackageReference Include="<#= _prefix #>.Lib.Cache.MemoryCache" Version="1.7.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.MySql" Version="1.7.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.SQLite" Version="1.7.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.SqlServer" Version="1.7.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Excel.EPPlus" Version="1.7.0" />
+    <PackageReference Include="<#= _prefix #>.Lib.Host.Web" Version="1.7.1" />
+    <PackageReference Include="<#= _prefix #>.Module.Admin.Web" Version="1.7.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Web\Web.csproj" />
   </ItemGroup>
+  
+  <Import Project="..\..\build\module.build.targets" />
 
-  <!--复制配置文件到输出目录-->
   <ItemGroup>
-    <Content Update="config\**">
+    <!--复制配置文件到输出目录-->
+    <None Update="config\**\*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    </None>
+    <!--复制模块相关文件到输出路径中-->
+    <None Update="_modules\**\*.*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.Extend.cs
index afe0ac5..ec51e18 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.Extend.cs
@@ -11,7 +11,7 @@ public partial class Program : ITemplateHandler
         public Program(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.cs
index a71da79..56039eb 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.cs
@@ -42,7 +42,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.tt
index 090ee44..a0c3473 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.tt
@@ -1,7 +1,7 @@
 <#@ template language="C#" #>
 using <#= _prefix #>.Lib.Host.Web;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.WebHost
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.WebHost
 {
     public class Program
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs
index 4ccb3ca..8c4a3f3 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs
@@ -11,7 +11,7 @@ public partial class Startup : ITemplateHandler
         public Startup(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs
index 2d54cbc..50fbaaf 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs
@@ -42,7 +42,7 @@ public virtual string TransformText()
             this.Write(".Module.");
             
             #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.tt
index 68f4ed0..ce997bb 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.tt
@@ -2,7 +2,7 @@
 using Microsoft.Extensions.Hosting;
 using <#= _prefix #>.Lib.Host.Web;
 
-namespace <#= _prefix #>.Module.<#= _model.Project.Code #>.WebHost
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.WebHost
 {
     public class Startup : StartupAbstract
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs
index 7a4b15f..d6fb821 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs
@@ -11,7 +11,7 @@ public partial class cache : ITemplateHandler
         public cache(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs
index c16c923..14f7d45 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs
@@ -11,7 +11,7 @@ public partial class cacheDevelopment : ITemplateHandler
         public cacheDevelopment(TemplateBuildModel model)
         {
             _model = model;
-            _prefix = model.Project.Prefix;
+            _prefix = model.Module.Prefix;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
index fa5d6ef..e939d0c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
@@ -11,7 +11,7 @@ public partial class db : ITemplateHandler
         public db(TemplateBuildModel model)
         {
             _model = model;
-            _dbPrefix = model.Project.UIPrefix;
+            _dbPrefix = model.Module.UiPrefix;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
index 53394e0..48f76d6 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class db : dbBase
     {
@@ -42,6 +42,8 @@ public virtual string TransformText()
   ""Password"": """",
   //�Ƿ񴴽����ݿ�ͱ�
   ""CreateDatabase"": true,
+  //�Ƿ񴴽����ݿ���ʼ������
+  ""InitData"": true,
   //ģ���б�
   ""Modules"": [
     {
@@ -50,29 +52,29 @@ public virtual string TransformText()
       //���ݿ�����
       ""Database"": """);
             
-            #line 25 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
+            #line 27 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_dbPrefix));
             
             #line default
             #line hidden
             this.Write("_Admin\"\r\n    },\r\n    {\r\n      \"Name\": \"");
             
-            #line 28 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 30 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write("\",\r\n      \"Database\": \"");
             
-            #line 29 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
+            #line 31 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_dbPrefix));
             
             #line default
             #line hidden
             this.Write("_");
             
-            #line 29 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.Code));
+            #line 31 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.tt
index 7af0cf3..725c74d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.tt
@@ -16,6 +16,8 @@
   "Password": "",
   //�Ƿ񴴽����ݿ�ͱ�
   "CreateDatabase": true,
+  //�Ƿ񴴽����ݿ���ʼ������
+  "InitData": true,
   //ģ���б�
   "Modules": [
     {
@@ -25,8 +27,8 @@
       "Database": "<#= _dbPrefix #>_Admin"
     },
     {
-      "Name": "<#= _model.Project.Code #>",
-      "Database": "<#= _dbPrefix #>_<#= _model.Project.Code #>"
+      "Name": "<#= _model.Module.Code #>",
+      "Database": "<#= _dbPrefix #>_<#= _model.Module.Code #>"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.cs
index b2e8f26..e94f1c1 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.cs
@@ -28,7 +28,7 @@ public virtual string TransformText()
             this.Write("{\r\n    //地址\r\n    \"Urls\": \"http://*:");
             
             #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\host.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Project.No + 6220));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.No + 6220));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.tt
index 6eda3cd..cd39218 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.tt
@@ -1,7 +1,7 @@
 <#@ template language="C#" #>
 {
     //地址
-    "Urls": "http://*:<#= _model.Project.No + 6220 #>",
+    "Urls": "http://*:<#= _model.Module.No + 6220 #>",
     //开启Swagger
     "Swagger": false
 }
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.cs
index fe0163e..567bbbe 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\jwt.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\jwt.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class jwt : jwtBase
     {
@@ -25,9 +25,9 @@ public partial class jwt : jwtBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("{\r\n  //��Կ\r\n  \"Key\": \"twAJ$j5##pVc5*y&\",\r\n  //������\r\n  \"Issuer\": \"http://www.iamoldl" +
-                    "i.com\",\r\n  //������\r\n  \"Audience\": \"http://www.iamoldli.com\",\r\n  //����(����)\r\n  \"Expi" +
-                    "res\": 120\r\n}");
+            this.Write("{\r\n  //��Կ\r\n  \"Key\": \"twAJ$j5##pVc5*y&\",\r\n  //������\r\n  \"Issuer\": \"http://www.17mkh.c" +
+                    "om\",\r\n  //������\r\n  \"Audience\": \"http://www.17mkh.com\",\r\n  //����(����)\r\n  \"Expires\": " +
+                    "120\r\n}");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.tt
index 8d8042d..1795352 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.tt
@@ -3,9 +3,9 @@
   //秘钥
   "Key": "twAJ$j5##pVc5*y&",
   //发行商
-  "Issuer": "http://www.iamoldli.com",
+  "Issuer": "http://www.17mkh.com",
   //订阅者
-  "Audience": "http://www.iamoldli.com",
+  "Audience": "http://www.17mkh.com",
   //有效期(分钟)
   "Expires": 120
 }
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.cs
index 76adfc7..174d009 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\loggingDevelopment.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\loggingDevelopment.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class loggingDevelopment : loggingDevelopmentBase
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.Extend.cs
deleted file mode 100644
index 44e4e4e..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.Extend.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    public partial class module : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-
-        public module(TemplateBuildModel model)
-        {
-            _model = model;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-            var filePath = Path.Combine(dir, "module.json");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.cs
deleted file mode 100644
index 5916813..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本: 16.0.0.0
-//  
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\module.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class module : moduleBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("{\r\n  //文件上传路径\r\n  \"UploadPath\": \"\", \r\n  //临时文件路径\r\n  \"TempPath\": \"\",\r\n  //权限管理模块配置\r" +
-                    "\n  \"Admin\": {\r\n    //是否开启审计功能\r\n    \"Auditing\": true,\r\n    //是否开启权限验证\r\n    \"Permi" +
-                    "ssionValidate\": true\r\n  }\r\n}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class moduleBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.tt
deleted file mode 100644
index be8bd51..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/module.tt
+++ /dev/null
@@ -1,14 +0,0 @@
-<#@ template language="C#" #>
-{
-  //文件上传路径
-  "UploadPath": "", 
-  //临时文件路径
-  "TempPath": "",
-  //权限管理模块配置
-  "Admin": {
-    //是否开启审计功能
-    "Auditing": true,
-    //是否开启权限验证
-    "PermissionValidate": true
-  }
-}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.Extend.cs
deleted file mode 100644
index d16a142..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.Extend.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    public partial class moduleDevelopment : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-
-        public moduleDevelopment(TemplateBuildModel model)
-        {
-            _model = model;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-            var filePath = Path.Combine(dir, "module.Development.json");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.cs
deleted file mode 100644
index ec4399f..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本: 16.0.0.0
-//  
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\moduleDevelopment.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class moduleDevelopment : moduleDevelopmentBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("{\r\n\r\n}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class moduleDevelopmentBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.tt
deleted file mode 100644
index da10b29..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/moduleDevelopment.tt
+++ /dev/null
@@ -1,4 +0,0 @@
-<#@ template language="C#" #>
-{
-
-}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Models/ClassBuildModel.cs b/src/Library/Infrastructure/Templates/Models/ClassBuildModel.cs
index 2f10252..2d760c5 100644
--- a/src/Library/Infrastructure/Templates/Models/ClassBuildModel.cs
+++ b/src/Library/Infrastructure/Templates/Models/ClassBuildModel.cs
@@ -32,6 +32,11 @@ public class ClassBuildModel
         /// </summary>
         public string Remarks { get; set; }
 
+        /// <summary>
+        /// 菜单图标
+        /// </summary>
+        public string MenuIcon { get; set; }
+
         /// <summary>
         /// 主键类型名称
         /// </summary>
diff --git a/src/Library/Infrastructure/Templates/Models/ProjectBuildModel.cs b/src/Library/Infrastructure/Templates/Models/ModuleBuildModel.cs
similarity index 83%
rename from src/Library/Infrastructure/Templates/Models/ProjectBuildModel.cs
rename to src/Library/Infrastructure/Templates/Models/ModuleBuildModel.cs
index 2ed374d..d678f4d 100644
--- a/src/Library/Infrastructure/Templates/Models/ProjectBuildModel.cs
+++ b/src/Library/Infrastructure/Templates/Models/ModuleBuildModel.cs
@@ -3,9 +3,9 @@
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Models
 {
     /// <summary>
-    /// 项目生成模型
+    /// 模块生成模型
     /// </summary>
-    public class ProjectBuildModel
+    public class ModuleBuildModel
     {
         /// <summary>
         /// 名称
@@ -17,6 +17,11 @@ public class ProjectBuildModel
         /// </summary>
         public int No { get; set; }
 
+        /// <summary>
+        /// 图标
+        /// </summary>
+        public string Icon { get; set; }
+
         /// <summary>
         /// 前缀
         /// </summary>
@@ -25,7 +30,7 @@ public class ProjectBuildModel
         /// <summary>
         /// 前端组件前缀
         /// </summary>
-        public string UIPrefix { get; set; }
+        public string UiPrefix { get; set; }
 
         /// <summary>
         /// 编码
diff --git a/src/Library/Infrastructure/Templates/Models/TemplateBuildModel.cs b/src/Library/Infrastructure/Templates/Models/TemplateBuildModel.cs
index 8ed90e1..f2a7662 100644
--- a/src/Library/Infrastructure/Templates/Models/TemplateBuildModel.cs
+++ b/src/Library/Infrastructure/Templates/Models/TemplateBuildModel.cs
@@ -16,8 +16,8 @@ public class TemplateBuildModel
         public string RootPath { get; set; }
 
         /// <summary>
-        /// 项目
+        /// 模块模型
         /// </summary>
-        public ProjectBuildModel Project { get; set; }
+        public ModuleBuildModel Module { get; set; }
     }
 }
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index dedcebd..a0e06e6 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netmodular-module-code-generator",
-  "version": "1.0.10",
+  "version": "1.1.0",
   "author": "Oldli",
   "license": "ISC",
   "code": "codeGenerator",
@@ -18,15 +18,15 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.1.5",
-    "netmodular-ui": "^1.4.3"
+    "netmodular-module-admin": "^1.1.9",
+    "netmodular-ui": "^1.4.6"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.1.2",
-    "@vue/cli-plugin-eslint": "^4.1.2",
-    "@vue/cli-plugin-router": "^4.1.2",
-    "@vue/cli-plugin-vuex": "^4.1.2",
-    "@vue/cli-service": "^4.1.2",
+    "@vue/cli-plugin-babel": "^4.2.2",
+    "@vue/cli-plugin-eslint": "^4.2.2",
+    "@vue/cli-plugin-router": "^4.2.2",
+    "@vue/cli-plugin-vuex": "^4.2.2",
+    "@vue/cli-service": "^4.2.2",
     "@vue/eslint-config-prettier": "^5.0.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^5.16.0",
@@ -34,7 +34,7 @@
     "eslint-plugin-vue": "^5.0.0",
     "prettier": "^1.18.2",
     "raw-loader": "^3.1.0",
-    "rimraf": "^3.0.0",
+    "rimraf": "^3.0.1",
     "sass": "^1.25.0",
     "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.11"
diff --git a/src/UI/module-code-generator/src/api/components/project.js b/src/UI/module-code-generator/src/api/components/module.js
similarity index 100%
rename from src/UI/module-code-generator/src/api/components/project.js
rename to src/UI/module-code-generator/src/api/components/module.js
diff --git a/src/UI/module-code-generator/src/views/class/components/save/index.vue b/src/UI/module-code-generator/src/views/class/components/save/index.vue
index 285a13d..841221e 100644
--- a/src/UI/module-code-generator/src/views/class/components/save/index.vue
+++ b/src/UI/module-code-generator/src/views/class/components/save/index.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="20" :offset="1">
         <el-form-item label="所属项目：">
-          <el-input v-model="project.name" disabled />
+          <el-input v-model="module.name" disabled />
         </el-form-item>
         <el-form-item label="基类类型：" prop="baseEntityType">
           <nm-select :disabled="isEdit_" :method="getBaseEntityTypeSelect" v-model="form.model.baseEntityType" />
@@ -17,6 +17,9 @@
         <el-form-item label="备注：" prop="remarks">
           <el-input v-model="form.model.remarks" />
         </el-form-item>
+        <el-form-item label="菜单图标：" prop="menuIcon">
+          <nm-icon-picker v-model="form.model.menuIcon" />
+        </el-form-item>
         <el-form-item label="基础方法：" prop="method">
           <el-checkbox v-model="form.model.method.add">Add</el-checkbox>
           <el-checkbox v-model="form.model.method.delete">Delete</el-checkbox>
@@ -45,11 +48,12 @@ export default {
       form: {
         width: '40%',
         model: {
-          projectId: '',
+          moduleId: '',
           name: '',
           tableName: '',
-          baseEntityType: 6,
+          baseEntityType: 7,
           remarks: '',
+          menuIcon: '',
           method: {
             query: true,
             add: true,
@@ -58,7 +62,7 @@ export default {
           }
         },
         rules: {
-          projectId: [{ required: true, message: '请选择项目', trigger: 'blur' }],
+          moduleId: [{ required: true, message: '请选择项目', trigger: 'blur' }],
           name: [{ required: true, message: '请输入实体名称', trigger: 'blur' }],
           remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }],
           tableName: [{ required: true, message: '请输入表名', trigger: 'blur' }]
@@ -70,7 +74,7 @@ export default {
     }
   },
   props: {
-    project: {
+    module: {
       type: Object,
       required: true
     }
@@ -80,7 +84,7 @@ export default {
       return getBaseEntityTypeSelect()
     },
     onReset() {
-      this.form.model.projectId = this.project.id
+      this.form.model.moduleId = this.module.id
     }
   }
 }
diff --git a/src/UI/module-code-generator/src/views/class/index/cols.js b/src/UI/module-code-generator/src/views/class/index/cols.js
index a827660..3fcd56f 100644
--- a/src/UI/module-code-generator/src/views/class/index/cols.js
+++ b/src/UI/module-code-generator/src/views/class/index/cols.js
@@ -19,6 +19,10 @@ export default [
     label: '基类类型',
     width: 250
   },
+  {
+    name: 'menuIcon',
+    label: '菜单图标'
+  },
   {
     name: 'remarks',
     label: '备注'
diff --git a/src/UI/module-code-generator/src/views/class/index/index.vue b/src/UI/module-code-generator/src/views/class/index/index.vue
index 68f3ca0..bda068c 100644
--- a/src/UI/module-code-generator/src/views/class/index/index.vue
+++ b/src/UI/module-code-generator/src/views/class/index/index.vue
@@ -11,6 +11,10 @@
         <nm-button type="success" text="添加" icon="add" @click="add" />
       </template>
 
+      <template v-slot:menuIcon="{ row }">
+        <nm-icon :name="row.menuIcon" />
+      </template>
+
       <template v-slot:col-operation="{ row }">
         <nm-button text="属性管理" icon="entity" type="text" @click="manageProperty(row)" />
         <nm-button text="视图模型" icon="entity" type="text" @click="openModelManage(row)" />
@@ -21,7 +25,7 @@
       </template>
     </nm-list>
 
-    <save-page :id="curr.id" :project="project" :visible.sync="dialog.save" @success="refresh" />
+    <save-page :id="curr.id" :module="module" :visible.sync="dialog.save" @success="refresh" />
     <property-page :parent="curr" :visible.sync="dialog.property" />
     <model-manage-page :parent="curr" :visible.sync="dialog.model" />
     <code-preview :id="curr.id" :visible.sync="dialog.codePreview" />
@@ -48,7 +52,7 @@ export default {
         action: api.query,
         operationWidth: '400',
         model: {
-          projectId: '',
+          moduleId: '',
           name: ''
         },
         cols
@@ -62,7 +66,7 @@ export default {
     }
   },
   props: {
-    project: {
+    module: {
       type: Object,
       required: true
     }
@@ -70,7 +74,7 @@ export default {
   computed: {
     dialogOptions() {
       return {
-        title: `实体列表(${this.project.name})`,
+        title: `实体列表(${this.module.name})`,
         icon: 'list',
         width: '80%'
       }
@@ -108,7 +112,7 @@ export default {
     },
     onReset() {
       console.log(1)
-      this.list.model.projectId = this.project.id
+      this.list.model.moduleId = this.module.id
       this.$refs.list.query()
     }
   }
diff --git a/src/UI/module-code-generator/src/views/project/components/save/index.vue b/src/UI/module-code-generator/src/views/module/components/save/index.vue
similarity index 85%
rename from src/UI/module-code-generator/src/views/project/components/save/index.vue
rename to src/UI/module-code-generator/src/views/module/components/save/index.vue
index aa12a7b..502dfa7 100644
--- a/src/UI/module-code-generator/src/views/project/components/save/index.vue
+++ b/src/UI/module-code-generator/src/views/module/components/save/index.vue
@@ -12,6 +12,9 @@
         <el-form-item label="编码：" prop="code">
           <el-input v-model="form.model.code" />
         </el-form-item>
+        <el-form-item label="图标：" prop="icon">
+          <nm-icon-picker v-model="form.model.icon" />
+        </el-form-item>
         <el-form-item label="版权声明：" prop="copyright">
           <el-input v-model="form.model.copyright" />
         </el-form-item>
@@ -22,7 +25,7 @@
 <script>
 import { mixins } from 'netmodular-ui'
 
-const { add, edit, update } = $api.codeGenerator.project
+const { add, edit, update } = $api.codeGenerator.module
 
 export default {
   mixins: [mixins.formSave],
@@ -37,6 +40,7 @@ export default {
           name: '',
           no: 0,
           code: '',
+          icon: '',
           copyright: ''
         },
         rules: {
@@ -46,6 +50,7 @@ export default {
             { required: true, message: '请输入编号', trigger: 'blur' },
             { type: 'number', min: 0, max: 59315, message: '编码在 0 到 59315 之间', trigger: 'blur' }
           ],
+          icon: [{ required: true, message: '请选择图标', trigger: 'blur' }],
           copyright: [{ required: true, message: '请输入版权声明', trigger: 'blur' }]
         }
       }
diff --git a/src/UI/module-code-generator/src/views/project/components/select/index.vue b/src/UI/module-code-generator/src/views/module/components/select/index.vue
similarity index 74%
rename from src/UI/module-code-generator/src/views/project/components/select/index.vue
rename to src/UI/module-code-generator/src/views/module/components/select/index.vue
index a5a8a1d..11fa1da 100644
--- a/src/UI/module-code-generator/src/views/project/components/select/index.vue
+++ b/src/UI/module-code-generator/src/views/module/components/select/index.vue
@@ -4,7 +4,7 @@ export default {
   mixins: [mixins.select],
   data() {
     return {
-      action: $api.codeGenerator.project.select
+      action: $api.codeGenerator.module.select
     }
   }
 }
diff --git a/src/UI/module-code-generator/src/views/project/index/cols.js b/src/UI/module-code-generator/src/views/module/index/cols.js
similarity index 90%
rename from src/UI/module-code-generator/src/views/project/index/cols.js
rename to src/UI/module-code-generator/src/views/module/index/cols.js
index 9c775a2..588f282 100644
--- a/src/UI/module-code-generator/src/views/project/index/cols.js
+++ b/src/UI/module-code-generator/src/views/module/index/cols.js
@@ -17,6 +17,10 @@ export default [
     name: 'code',
     label: '编码'
   },
+  {
+    name: 'icon',
+    label: '图标'
+  },
   {
     name: 'copyright',
     label: '版权声明'
diff --git a/src/UI/module-code-generator/src/views/project/index/index.vue b/src/UI/module-code-generator/src/views/module/index/index.vue
similarity index 91%
rename from src/UI/module-code-generator/src/views/project/index/index.vue
rename to src/UI/module-code-generator/src/views/module/index/index.vue
index 0350e39..f9ec62e 100644
--- a/src/UI/module-code-generator/src/views/project/index/index.vue
+++ b/src/UI/module-code-generator/src/views/module/index/index.vue
@@ -19,6 +19,10 @@
       <!--是否显示-->
       <template v-slot:col-isShow="{ row }">{{ row.isShow ? '是' : '否' }}</template>
 
+      <template v-slot:col-icon="{ row }">
+        <nm-icon :name="row.icon" />
+      </template>
+
       <!--操作列-->
       <template v-slot:col-operation="{ row }">
         <nm-button v-bind="buttons.classManage" @click="manageClass(row)" />
@@ -30,7 +34,7 @@
 
     <save-page :id="curr.id" :visible.sync="dialog.save" @success="refresh" />
     <!--类管理-->
-    <class-page :project="curr" :visible.sync="dialog.class" />
+    <class-page :module="curr" :visible.sync="dialog.class" />
   </nm-container>
 </template>
 <script>
@@ -40,7 +44,7 @@ import cols from './cols'
 import SavePage from '../components/save'
 import ClassPage from '../../class/index'
 
-const api = $api.codeGenerator.project
+const api = $api.codeGenerator.module
 
 export default {
   name: page.name,
diff --git a/src/UI/module-code-generator/src/views/project/index/page.js b/src/UI/module-code-generator/src/views/module/index/page.js
similarity index 85%
rename from src/UI/module-code-generator/src/views/project/index/page.js
rename to src/UI/module-code-generator/src/views/module/index/page.js
index b061247..e78e364 100644
--- a/src/UI/module-code-generator/src/views/project/index/page.js
+++ b/src/UI/module-code-generator/src/views/module/index/page.js
@@ -1,9 +1,9 @@
 /** 页面信息 */
 const page = new (function() {
   this.title = '模块列表'
-  this.icon = 'project'
-  this.name = 'codegenerator_project'
-  this.path = '/codegenerator/project'
+  this.icon = 'product'
+  this.name = 'codegenerator_module'
+  this.path = '/codegenerator/module'
 
   // 关联权限
   this.permissions = [`${this.name}_query_get`]
@@ -51,7 +51,7 @@ const page = new (function() {
 /** 路由信息 */
 export const route = {
   page,
-  component: () => import(/* webpackChunkName: "codegenerator.project" */ './index')
+  component: () => import(/* webpackChunkName: "codegenerator.module" */ './index')
 }
 
 export default page
diff --git a/src/Web/Controllers/ClassController.cs b/src/Web/Controllers/ClassController.cs
index 92ef2c3..4d5fab1 100644
--- a/src/Web/Controllers/ClassController.cs
+++ b/src/Web/Controllers/ClassController.cs
@@ -5,32 +5,31 @@
 using System.Web;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.Extensions.Options;
 using NetModular.Lib.Auth.Web.Attributes;
 using NetModular.Lib.Utils.Core.Extensions;
-using NetModular.Lib.Utils.Core.Options;
 using NetModular.Lib.Utils.Core.Result;
+using NetModular.Lib.Utils.Core.SystemConfig;
 using NetModular.Module.CodeGenerator.Application.ClassService;
 using NetModular.Module.CodeGenerator.Application.ClassService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Class;
 using NetModular.Module.CodeGenerator.Domain.Class.Models;
-using NetModular.Module.CodeGenerator.Infrastructure.Options;
+using NetModular.Module.CodeGenerator.Infrastructure;
 
 namespace NetModular.Module.CodeGenerator.Web.Controllers
 {
     [Description("实体管理")]
     [Common]
-    public class ClassController : ModuleController
+    public class ClassController : Web.ModuleController
     {
-        private readonly IClassService _service;
-        private readonly ModuleCommonOptions _commonOptions;
+        private readonly SystemConfigModel _systemConfig;
         private readonly CodeGeneratorOptions _codeGeneratorOptions;
+        private readonly IClassService _service;
 
-        public ClassController(IClassService service, IOptionsMonitor<ModuleCommonOptions> commonOption, IOptionsMonitor<CodeGeneratorOptions> codeGeneratorOptions)
+        public ClassController(SystemConfigModel systemConfig, CodeGeneratorOptions codeGeneratorOptions, IClassService service)
         {
+            _systemConfig = systemConfig;
+            _codeGeneratorOptions = codeGeneratorOptions;
             _service = service;
-            _codeGeneratorOptions = codeGeneratorOptions.CurrentValue;
-            _commonOptions = commonOption.CurrentValue;
         }
 
         [HttpGet]
@@ -81,7 +80,7 @@ public IResultModel BaseEntityTypeSelect()
         public async Task<IActionResult> BuildCode([BindRequired]Guid id)
         {
             var result = await _service.BuildCode(id);
-            var path = Path.Combine(_commonOptions.TempPath, _codeGeneratorOptions.BuildCodePath, result.Data.Id + ".zip");
+            var path = Path.Combine(_codeGeneratorOptions.BuildCodePath, result.Data.Id + ".zip");
             return PhysicalFile(path, "application/octet-stream", HttpUtility.UrlEncode(result.Data.Name), true);
         }
     }
diff --git a/src/Web/Controllers/EnumController.cs b/src/Web/Controllers/EnumController.cs
index 9f157e1..4a96a57 100644
--- a/src/Web/Controllers/EnumController.cs
+++ b/src/Web/Controllers/EnumController.cs
@@ -12,7 +12,7 @@
 namespace NetModular.Module.CodeGenerator.Web.Controllers
 {
     [Description("枚举管理")]
-    public class EnumController : ModuleController
+    public class EnumController : Web.ModuleController
     {
         private readonly IEnumService _service;
 
diff --git a/src/Web/Controllers/EnumItemController.cs b/src/Web/Controllers/EnumItemController.cs
index 2fcd4a0..5c8c883 100644
--- a/src/Web/Controllers/EnumItemController.cs
+++ b/src/Web/Controllers/EnumItemController.cs
@@ -14,7 +14,7 @@ namespace NetModular.Module.CodeGenerator.Web.Controllers
 {
     [Description("枚举项管理")]
     [Common]
-    public class EnumItemController : ModuleController
+    public class EnumItemController : Web.ModuleController
     {
         private readonly IEnumItemService _service;
 
diff --git a/src/Web/Controllers/ModelPropertyController.cs b/src/Web/Controllers/ModelPropertyController.cs
index 5e7a7c1..778802f 100644
--- a/src/Web/Controllers/ModelPropertyController.cs
+++ b/src/Web/Controllers/ModelPropertyController.cs
@@ -14,7 +14,7 @@ namespace NetModular.Module.CodeGenerator.Web.Controllers
 {
     [Description("模型属性管理")]
     [Common]
-    public class ModelPropertyController : ModuleController
+    public class ModelPropertyController : Web.ModuleController
     {
         private readonly IModelPropertyService _service;
 
diff --git a/src/Web/Controllers/ProjectController.cs b/src/Web/Controllers/ModuleController.cs
similarity index 52%
rename from src/Web/Controllers/ProjectController.cs
rename to src/Web/Controllers/ModuleController.cs
index 099b911..0a6472b 100644
--- a/src/Web/Controllers/ProjectController.cs
+++ b/src/Web/Controllers/ModuleController.cs
@@ -5,39 +5,39 @@
 using System.Web;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.Extensions.Options;
-using NetModular.Lib.Utils.Core.Options;
 using NetModular.Lib.Utils.Core.Result;
-using NetModular.Module.CodeGenerator.Application.ProjectService;
-using NetModular.Module.CodeGenerator.Application.ProjectService.ViewModels;
-using NetModular.Module.CodeGenerator.Domain.Project.Models;
-using NetModular.Module.CodeGenerator.Infrastructure.Options;
+using NetModular.Lib.Utils.Core.SystemConfig;
+using NetModular.Module.CodeGenerator.Application.ModuleService;
+using NetModular.Module.CodeGenerator.Application.ModuleService.ViewModels;
+using NetModular.Module.CodeGenerator.Domain.Module.Models;
+using NetModular.Module.CodeGenerator.Infrastructure;
 
 namespace NetModular.Module.CodeGenerator.Web.Controllers
 {
-    [Description("项目管理")]
-    public class ProjectController : ModuleController
+    [Description("模块管理")]
+    public class ModuleController : Web.ModuleController
     {
-        private readonly IProjectService _service;
-        private readonly ModuleCommonOptions _commonOptions;
+        private readonly SystemConfigModel _systemConfig;
         private readonly CodeGeneratorOptions _codeGeneratorOptions;
-        public ProjectController(IProjectService service, IOptionsMonitor<ModuleCommonOptions> commonOptions, IOptionsMonitor<CodeGeneratorOptions> codeGeneratorOptions)
+        private readonly IModuleService _service;
+
+        public ModuleController(SystemConfigModel systemConfig, CodeGeneratorOptions codeGeneratorOptions, IModuleService service)
         {
+            _systemConfig = systemConfig;
+            _codeGeneratorOptions = codeGeneratorOptions;
             _service = service;
-            _commonOptions = commonOptions.CurrentValue;
-            _codeGeneratorOptions = codeGeneratorOptions.CurrentValue;
         }
 
         [HttpGet]
         [Description("查询")]
-        public async Task<IResultModel> Query([FromQuery]ProjectQueryModel model)
+        public async Task<IResultModel> Query([FromQuery]ModuleQueryModel model)
         {
             return await _service.Query(model);
         }
 
         [HttpPost]
         [Description("添加")]
-        public Task<IResultModel> Add(ProjectAddModel model)
+        public Task<IResultModel> Add(ModuleAddModel model)
         {
             return _service.Add(model);
         }
@@ -58,17 +58,17 @@ public Task<IResultModel> Edit([BindRequired]Guid id)
 
         [HttpPost]
         [Description("修改")]
-        public Task<IResultModel> Update(ProjectUpdateModel model)
+        public Task<IResultModel> Update(ModuleUpdateModel model)
         {
             return _service.Update(model);
         }
 
         [HttpPost]
         [Description("生成代码")]
-        public async Task<IActionResult> BuildCode(ProjectBuildCodeModel model)
+        public async Task<IActionResult> BuildCode(ModuleBuildCodeModel model)
         {
             var result = await _service.BuildCode(model);
-            var path = Path.Combine(_commonOptions.TempPath, _codeGeneratorOptions.BuildCodePath, result.Data.Id + ".zip");
+            var path = Path.Combine(_codeGeneratorOptions.BuildCodePath, result.Data.Id + ".zip");
             return PhysicalFile(path, "application/octet-stream", HttpUtility.UrlEncode(result.Data.Name), true);
         }
     }
diff --git a/src/Web/Controllers/PropertyController.cs b/src/Web/Controllers/PropertyController.cs
index 67f934b..24d2a10 100644
--- a/src/Web/Controllers/PropertyController.cs
+++ b/src/Web/Controllers/PropertyController.cs
@@ -16,7 +16,7 @@ namespace NetModular.Module.CodeGenerator.Web.Controllers
 {
     [Description("实体属性管理")]
     [Common]
-    public class PropertyController : ModuleController
+    public class PropertyController : Web.ModuleController
     {
         private readonly IPropertyService _service;
 
diff --git a/src/Web/ModuleInitializer.cs b/src/Web/ModuleInitializer.cs
index 85b061a..11ea0c4 100644
--- a/src/Web/ModuleInitializer.cs
+++ b/src/Web/ModuleInitializer.cs
@@ -1,12 +1,7 @@
 using Microsoft.AspNetCore.Builder;
-#if NETSTANDARD2_0
-using Microsoft.AspNetCore.Hosting;
-#endif
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-#if NETCOREAPP3_1
 using Microsoft.Extensions.Hosting;
-#endif
 using NetModular.Lib.Module.AspNetCore;
 
 namespace NetModular.Module.CodeGenerator.Web
@@ -18,11 +13,7 @@ public class ModuleInitializer : IModuleInitializer
         /// </summary>
         /// <param name="services"></param>
         /// <param name="env"></param>
-#if NETSTANDARD2_0
-        public void ConfigureServices(IServiceCollection services, IHostingEnvironment env)
-#elif NETCOREAPP3_1
         public void ConfigureServices(IServiceCollection services, IHostEnvironment env)
-#endif
         {
         }
 
@@ -31,11 +22,7 @@ public void ConfigureServices(IServiceCollection services, IHostEnvironment env)
         /// </summary>
         /// <param name="app"></param>
         /// <param name="env"></param>
-#if NETSTANDARD2_0
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
-#elif NETCOREAPP3_1
         public void Configure(IApplicationBuilder app, IHostEnvironment env)
-#endif
         {
         }
 
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index fcfb948..6587c96 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -1,19 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.5.6" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.5.5" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.6.5" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.5.2" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.7.0" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.7.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.7.1" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.7.0" />
   </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\Library\Application\Application.csproj" />
   </ItemGroup>
 
+  <!--打包模块相关文件到NuGet包中，此功能需要编译两次项目才行，因为打包操作在创建_module.json文件之前执行的-->
+  <ItemGroup>
+    <Content Include="$(SolutionDir)\src\WebHost\_modules*\**\*.*" PackagePath="contentFiles\any\any">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
 </Project>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 41bc059..3d50a37 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -2,27 +2,37 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <!--复制本地锁定的程序集到输出目录-->
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
+    <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.5.4" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.6.7" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.6.7" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.6.7" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.5.1" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.6.0" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.6.6" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.7.0" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.7.0" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.7.0" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.7.0" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.7.0" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.7.1" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.7.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Web\Web.csproj" />
   </ItemGroup>
 
-  <!--复制配置文件到输出目录-->
+  <Import Project="..\..\build\module.build.targets" />
+
   <ItemGroup>
-    <Content Update="config\**">
+    <!--复制配置文件到输出目录-->
+    <None Update="config\**\*.*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <!--复制模块相关文件到输出路径中-->
+    <None Update="_modules\**\*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
new file mode 100644
index 0000000..9aca590
--- /dev/null
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -0,0 +1 @@
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.0"}
diff --git a/src/WebHost/config/db.json b/src/WebHost/config/db.json
index fc859b2..9a4cdd7 100644
--- a/src/WebHost/config/db.json
+++ b/src/WebHost/config/db.json
@@ -15,6 +15,8 @@
   "Password": "",
   //�Ƿ񴴽����ݿ�ͱ�
   "CreateDatabase": true,
+  //�Ƿ񴴽����ݿ���ʼ������
+  "InitData": true,
   //ģ���б�
   "Modules": [
     {
diff --git a/src/WebHost/config/module.Development.json b/src/WebHost/config/module.Development.json
deleted file mode 100644
index 0e0dcd2..0000000
--- a/src/WebHost/config/module.Development.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-
-}
\ No newline at end of file
diff --git a/src/WebHost/config/module.json b/src/WebHost/config/module.json
deleted file mode 100644
index 17f2831..0000000
--- a/src/WebHost/config/module.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  //文件上传路径
-  "UploadPath": "",
-  //临时文件路径
-  "TempPath": "",
-  //权限管理模块配置
-  "Admin": {
-    //是否开启审计功能
-    "Auditing": true,
-    //是否开启权限验证
-    "PermissionValidate": true
-  },
-  //代码生成器
-  "CodeGenerator": {
-    //项目前缀
-    "Prefix": "NetModular",
-    //前端组件前缀
-    "UIPrefix": "Nm" 
-  } 
-}
\ No newline at end of file

From 6b47c88daf5e8ed1c510e732f8f4b78919978670 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Sun, 9 Feb 2020 22:23:13 +0800
Subject: [PATCH 21/71] update

---
 src/Directory.Build.props                     |   2 +-
 src/Library/Application/Application.csproj    |   4 +-
 src/Library/Domain/Domain.csproj              |   6 +-
 .../Infrastructure/Infrastructure.csproj      |  36 +-
 .../ModuleServicesConfigurator.Extend.cs      |  30 ++
 .../ModuleServicesConfigurator.cs             | 332 ++++++++++++++++++
 .../ModuleServicesConfigurator.tt             |  13 +
 .../Default/T4/src/Web/ModuleInitializer.cs   |   2 +-
 .../Default/T4/src/Web/ModuleInitializer.tt   |   2 +-
 src/Web/ModuleInitializer.cs                  |   5 +-
 src/Web/Web.csproj                            |   8 +-
 src/WebHost/WebHost.csproj                    |  14 +-
 .../_modules/CodeGenerator/_module.json       |   2 +-
 13 files changed, 410 insertions(+), 46 deletions(-)
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.Extend.cs
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.cs
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.tt

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index bf90f03..514ec6a 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.6.0</Version>
+    <Version>1.6.1</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 7239316..df29635 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.7.0" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.7.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.7.2" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index cc2c89d..614aeda 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.7.0" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.7.0" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.7.1" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.7.2" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 698e2fe..58b5169 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.7.1" />
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.7.1" />
+    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.7.2" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.7.2" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
@@ -23,6 +23,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt">
+      <Generator>TextTemplatingFilePreprocessor</Generator>
+      <LastGenOutput>ModuleServicesConfigurator.cs</LastGenOutput>
+    </None>
     <None Update="Templates\Default\T4\script\NpmInstall.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>NpmInstall.cs</LastGenOutput>
@@ -326,6 +330,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.*">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ModuleServicesConfigurator.tt</DependentUpon>
+    </Compile>
     <Compile Update="Templates\Default\T4\script\NpmInstall.*">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -713,27 +722,4 @@
     </Compile>
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Page.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Page.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\db.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>db.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\jwt.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>jwt.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\loggingDevelopment.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>loggingDevelopment.tt</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.Extend.cs
new file mode 100644
index 0000000..8c1ec63
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.Extend.cs
@@ -0,0 +1,30 @@
+using System.IO;
+using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Infrastructure
+{
+    public partial class ModuleServicesConfigurator : ITemplateHandler
+    {
+        private readonly TemplateBuildModel _model;
+        private readonly string _prefix;
+
+        public ModuleServicesConfigurator(TemplateBuildModel model)
+        {
+            _model = model;
+            _prefix = model.Module.Prefix;
+        }
+
+        public bool IsGlobal => true;
+
+        public void Save()
+        {
+            var dir = Path.Combine(_model.RootPath, "src/Library/Infrastructure");
+            if (!Directory.Exists(dir))
+                Directory.CreateDirectory(dir);
+
+            var content = TransformText();
+            var filePath = Path.Combine(dir, "ModuleServicesConfigurator.cs");
+            File.WriteAllText(filePath, content);
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.cs
new file mode 100644
index 0000000..8c4c73c
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.cs
@@ -0,0 +1,332 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本: 16.0.0.0
+//  
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+// ------------------------------------------------------------------------------
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Infrastructure
+{
+    using System;
+    
+    /// <summary>
+    /// Class to produce the template output
+    /// </summary>
+    
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public partial class ModuleServicesConfigurator : ModuleServicesConfiguratorBase
+    {
+#line hidden
+        /// <summary>
+        /// Create the template output
+        /// </summary>
+        public virtual string TransformText()
+        {
+            this.Write("using Microsoft.Extensions.DependencyInjection;\r\nusing Microsoft.Extensions.Hosti" +
+                    "ng;\r\nusing ");
+            
+            #line 3 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            
+            #line default
+            #line hidden
+            this.Write(".Lib.Module.Abstractions;\r\n\r\nnamespace ");
+            
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            
+            #line default
+            #line hidden
+            this.Write(".Module.");
+            
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
+            
+            #line default
+            #line hidden
+            this.Write(".Infrastructure\r\n{\r\n    public class ModuleServicesConfigurator : IModuleServices" +
+                    "Configurator\r\n    {\r\n        public void Configure(IServiceCollection services, " +
+                    "IModuleCollection modules, IHostEnvironment env)\r\n        {\r\n        }\r\n    }\r\n}" +
+                    "\r\n");
+            return this.GenerationEnvironment.ToString();
+        }
+    }
+    
+    #line default
+    #line hidden
+    #region Base class
+    /// <summary>
+    /// Base class for this transformation
+    /// </summary>
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    public class ModuleServicesConfiguratorBase
+    {
+        #region Fields
+        private global::System.Text.StringBuilder generationEnvironmentField;
+        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
+        private global::System.Collections.Generic.List<int> indentLengthsField;
+        private string currentIndentField = "";
+        private bool endsWithNewline;
+        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
+        #endregion
+        #region Properties
+        /// <summary>
+        /// The string builder that generation-time code is using to assemble generated output
+        /// </summary>
+        protected System.Text.StringBuilder GenerationEnvironment
+        {
+            get
+            {
+                if ((this.generationEnvironmentField == null))
+                {
+                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
+                }
+                return this.generationEnvironmentField;
+            }
+            set
+            {
+                this.generationEnvironmentField = value;
+            }
+        }
+        /// <summary>
+        /// The error collection for the generation process
+        /// </summary>
+        public System.CodeDom.Compiler.CompilerErrorCollection Errors
+        {
+            get
+            {
+                if ((this.errorsField == null))
+                {
+                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
+                }
+                return this.errorsField;
+            }
+        }
+        /// <summary>
+        /// A list of the lengths of each indent that was added with PushIndent
+        /// </summary>
+        private System.Collections.Generic.List<int> indentLengths
+        {
+            get
+            {
+                if ((this.indentLengthsField == null))
+                {
+                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
+                }
+                return this.indentLengthsField;
+            }
+        }
+        /// <summary>
+        /// Gets the current indent we use when adding lines to the output
+        /// </summary>
+        public string CurrentIndent
+        {
+            get
+            {
+                return this.currentIndentField;
+            }
+        }
+        /// <summary>
+        /// Current transformation session
+        /// </summary>
+        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
+        {
+            get
+            {
+                return this.sessionField;
+            }
+            set
+            {
+                this.sessionField = value;
+            }
+        }
+        #endregion
+        #region Transform-time helpers
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void Write(string textToAppend)
+        {
+            if (string.IsNullOrEmpty(textToAppend))
+            {
+                return;
+            }
+            // If we're starting off, or if the previous text ended with a newline,
+            // we have to append the current indent first.
+            if (((this.GenerationEnvironment.Length == 0) 
+                        || this.endsWithNewline))
+            {
+                this.GenerationEnvironment.Append(this.currentIndentField);
+                this.endsWithNewline = false;
+            }
+            // Check if the current text ends with a newline
+            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
+            {
+                this.endsWithNewline = true;
+            }
+            // This is an optimization. If the current indent is "", then we don't have to do any
+            // of the more complex stuff further down.
+            if ((this.currentIndentField.Length == 0))
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+                return;
+            }
+            // Everywhere there is a newline in the text, add an indent after it
+            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
+            // If the text ends with a newline, then we should strip off the indent added at the very end
+            // because the appropriate indent will be added when the next time Write() is called
+            if (this.endsWithNewline)
+            {
+                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
+            }
+            else
+            {
+                this.GenerationEnvironment.Append(textToAppend);
+            }
+        }
+        /// <summary>
+        /// Write text directly into the generated output
+        /// </summary>
+        public void WriteLine(string textToAppend)
+        {
+            this.Write(textToAppend);
+            this.GenerationEnvironment.AppendLine();
+            this.endsWithNewline = true;
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void Write(string format, params object[] args)
+        {
+            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Write formatted text directly into the generated output
+        /// </summary>
+        public void WriteLine(string format, params object[] args)
+        {
+            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
+        }
+        /// <summary>
+        /// Raise an error
+        /// </summary>
+        public void Error(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Raise a warning
+        /// </summary>
+        public void Warning(string message)
+        {
+            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
+            error.ErrorText = message;
+            error.IsWarning = true;
+            this.Errors.Add(error);
+        }
+        /// <summary>
+        /// Increase the indent
+        /// </summary>
+        public void PushIndent(string indent)
+        {
+            if ((indent == null))
+            {
+                throw new global::System.ArgumentNullException("indent");
+            }
+            this.currentIndentField = (this.currentIndentField + indent);
+            this.indentLengths.Add(indent.Length);
+        }
+        /// <summary>
+        /// Remove the last indent that was added with PushIndent
+        /// </summary>
+        public string PopIndent()
+        {
+            string returnValue = "";
+            if ((this.indentLengths.Count > 0))
+            {
+                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
+                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
+                if ((indentLength > 0))
+                {
+                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
+                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
+                }
+            }
+            return returnValue;
+        }
+        /// <summary>
+        /// Remove any indentation
+        /// </summary>
+        public void ClearIndent()
+        {
+            this.indentLengths.Clear();
+            this.currentIndentField = "";
+        }
+        #endregion
+        #region ToString Helpers
+        /// <summary>
+        /// Utility class to produce culture-oriented representation of an object as a string.
+        /// </summary>
+        public class ToStringInstanceHelper
+        {
+            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
+            /// <summary>
+            /// Gets or sets format provider to be used by ToStringWithCulture method.
+            /// </summary>
+            public System.IFormatProvider FormatProvider
+            {
+                get
+                {
+                    return this.formatProviderField ;
+                }
+                set
+                {
+                    if ((value != null))
+                    {
+                        this.formatProviderField  = value;
+                    }
+                }
+            }
+            /// <summary>
+            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
+            /// </summary>
+            public string ToStringWithCulture(object objectToConvert)
+            {
+                if ((objectToConvert == null))
+                {
+                    throw new global::System.ArgumentNullException("objectToConvert");
+                }
+                System.Type t = objectToConvert.GetType();
+                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
+                            typeof(System.IFormatProvider)});
+                if ((method == null))
+                {
+                    return objectToConvert.ToString();
+                }
+                else
+                {
+                    return ((string)(method.Invoke(objectToConvert, new object[] {
+                                this.formatProviderField })));
+                }
+            }
+        }
+        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
+        /// <summary>
+        /// Helper to produce culture-oriented representation of an object as a string
+        /// </summary>
+        public ToStringInstanceHelper ToStringHelper
+        {
+            get
+            {
+                return this.toStringHelperField;
+            }
+        }
+        #endregion
+    }
+    #endregion
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.tt
new file mode 100644
index 0000000..6d71b12
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.tt
@@ -0,0 +1,13 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using <#= _prefix #>.Lib.Module.Abstractions;
+
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Infrastructure
+{
+    public class ModuleServicesConfigurator : IModuleServicesConfigurator
+    {
+        public void Configure(IServiceCollection services, IModuleCollection modules, IHostEnvironment env)
+        {
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
index 1c487de..c104885 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
@@ -56,7 +56,7 @@ public class ModuleInitializer : IModuleInitializer
         /// 注入服务
         /// </summary>
         /// <param name=""services""></param>
-        public void ConfigureServices(IServiceCollection services, IHostEnvironment env)
+        public void ConfigureServices(IServiceCollection services, IModuleCollection modules, IHostEnvironment env)
         {
         }
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
index da4ac12..46b8ce1 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
@@ -13,7 +13,7 @@ namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Web
         /// 注入服务
         /// </summary>
         /// <param name="services"></param>
-        public void ConfigureServices(IServiceCollection services, IHostEnvironment env)
+        public void ConfigureServices(IServiceCollection services, IModuleCollection modules, IHostEnvironment env)
         {
         }
 
diff --git a/src/Web/ModuleInitializer.cs b/src/Web/ModuleInitializer.cs
index 11ea0c4..32a56c5 100644
--- a/src/Web/ModuleInitializer.cs
+++ b/src/Web/ModuleInitializer.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using NetModular.Lib.Module.Abstractions;
 using NetModular.Lib.Module.AspNetCore;
 
 namespace NetModular.Module.CodeGenerator.Web
@@ -12,9 +13,11 @@ public class ModuleInitializer : IModuleInitializer
         /// 注入服务
         /// </summary>
         /// <param name="services"></param>
+        /// <param name="modules"></param>
         /// <param name="env"></param>
-        public void ConfigureServices(IServiceCollection services, IHostEnvironment env)
+        public void ConfigureServices(IServiceCollection services, IModuleCollection modules, IHostEnvironment env)
         {
+            
         }
 
         /// <summary>
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 6587c96..b029c66 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.7.0" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.7.0" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.7.1" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.7.0" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.7.2" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 3d50a37..d32a8e1 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.7.0" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.7.0" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.7.0" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.7.0" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.7.0" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.7.1" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.7.1" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.7.2" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.7.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index 9aca590..49b3510 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.0"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.1"}

From dc401e69951d5f354a26f37db07c9e78258cf7b5 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Sun, 9 Feb 2020 22:50:23 +0800
Subject: [PATCH 22/71] update

---
 src/Directory.Build.props                          |  2 +-
 src/Library/Infrastructure/CodeGeneratorOptions.cs | 11 ++++++++---
 src/WebHost/_modules/CodeGenerator/_module.json    |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 514ec6a..02883b3 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.6.1</Version>
+    <Version>1.6.2</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Infrastructure/CodeGeneratorOptions.cs b/src/Library/Infrastructure/CodeGeneratorOptions.cs
index 52f225d..81fabca 100644
--- a/src/Library/Infrastructure/CodeGeneratorOptions.cs
+++ b/src/Library/Infrastructure/CodeGeneratorOptions.cs
@@ -7,10 +7,15 @@ namespace NetModular.Module.CodeGenerator.Infrastructure
 {
     public class CodeGeneratorOptions : IModuleOptions
     {
-        public SystemConfigModel SystemConfig { get; set; }
+        private readonly SystemConfigModel _systemConfig;
 
         private string _buildCodePath;
 
+        public CodeGeneratorOptions(SystemConfigModel systemConfig)
+        {
+            _systemConfig = systemConfig;
+        }
+
         /// <summary>
         /// 生成代码存储路径
         /// </summary>
@@ -21,11 +26,11 @@ public string BuildCodePath
             {
                 if (_buildCodePath.IsNull())
                 {
-                    _buildCodePath = Path.Combine(SystemConfig.Path.TempPath, "CodeGenerator", "BuildCode");
+                    _buildCodePath = Path.Combine(_systemConfig.Path.TempPath, "CodeGenerator", "BuildCode");
                 }
                 else if (!Path.IsPathRooted(_buildCodePath))
                 {
-                    _buildCodePath = Path.Combine(SystemConfig.Path.TempPath, _buildCodePath);
+                    _buildCodePath = Path.Combine(_systemConfig.Path.TempPath, _buildCodePath);
                 }
                 return _buildCodePath;
             }
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index 49b3510..57da871 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.1"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.2"}

From 2965102389fcdf51bd901e2231ebdd4f2daea128 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Mon, 10 Feb 2020 20:38:16 +0800
Subject: [PATCH 23/71] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84async=20await?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Web/Controllers/ClassController.cs         | 8 ++++----
 src/Web/Controllers/EnumController.cs          | 8 ++++----
 src/Web/Controllers/EnumItemController.cs      | 8 ++++----
 src/Web/Controllers/ModelPropertyController.cs | 8 ++++----
 src/Web/Controllers/ModuleController.cs        | 4 ++--
 src/Web/Controllers/PropertyController.cs      | 8 ++++----
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/Web/Controllers/ClassController.cs b/src/Web/Controllers/ClassController.cs
index 4d5fab1..d4ab239 100644
--- a/src/Web/Controllers/ClassController.cs
+++ b/src/Web/Controllers/ClassController.cs
@@ -48,16 +48,16 @@ public Task<IResultModel> Add(ClassAddModel model)
 
         [HttpDelete]
         [Description("删除")]
-        public async Task<IResultModel> Delete([BindRequired]Guid id)
+        public Task<IResultModel> Delete([BindRequired]Guid id)
         {
-            return await _service.Delete(id);
+            return _service.Delete(id);
         }
 
         [HttpGet]
         [Description("编辑")]
-        public async Task<IResultModel> Edit([BindRequired]Guid id)
+        public Task<IResultModel> Edit([BindRequired]Guid id)
         {
-            return await _service.Edit(id);
+            return _service.Edit(id);
         }
 
         [HttpPost]
diff --git a/src/Web/Controllers/EnumController.cs b/src/Web/Controllers/EnumController.cs
index 4a96a57..c419b77 100644
--- a/src/Web/Controllers/EnumController.cs
+++ b/src/Web/Controllers/EnumController.cs
@@ -37,16 +37,16 @@ public Task<IResultModel> Add(EnumAddModel model)
 
         [HttpDelete]
         [Description("删除")]
-        public async Task<IResultModel> Delete([BindRequired] Guid id)
+        public Task<IResultModel> Delete([BindRequired] Guid id)
         {
-            return await _service.Delete(id);
+            return _service.Delete(id);
         }
 
         [HttpGet]
         [Description("编辑")]
-        public async Task<IResultModel> Edit([BindRequired] Guid id)
+        public Task<IResultModel> Edit([BindRequired] Guid id)
         {
-            return await _service.Edit(id);
+            return _service.Edit(id);
         }
 
         [HttpPost]
diff --git a/src/Web/Controllers/EnumItemController.cs b/src/Web/Controllers/EnumItemController.cs
index 5c8c883..e09221e 100644
--- a/src/Web/Controllers/EnumItemController.cs
+++ b/src/Web/Controllers/EnumItemController.cs
@@ -39,16 +39,16 @@ public Task<IResultModel> Add(EnumItemAddModel model)
 
         [HttpDelete]
         [Description("删除")]
-        public async Task<IResultModel> Delete([BindRequired]Guid id)
+        public Task<IResultModel> Delete([BindRequired]Guid id)
         {
-            return await _service.Delete(id);
+            return _service.Delete(id);
         }
 
         [HttpGet]
         [Description("编辑")]
-        public async Task<IResultModel> Edit([BindRequired]Guid id)
+        public Task<IResultModel> Edit([BindRequired]Guid id)
         {
-            return await _service.Edit(id);
+            return _service.Edit(id);
         }
 
         [HttpPost]
diff --git a/src/Web/Controllers/ModelPropertyController.cs b/src/Web/Controllers/ModelPropertyController.cs
index 778802f..369ed95 100644
--- a/src/Web/Controllers/ModelPropertyController.cs
+++ b/src/Web/Controllers/ModelPropertyController.cs
@@ -39,16 +39,16 @@ public Task<IResultModel> Add(ModelPropertyAddModel model)
 
         [HttpDelete]
         [Description("删除")]
-        public async Task<IResultModel> Delete([BindRequired]Guid id)
+        public Task<IResultModel> Delete([BindRequired]Guid id)
         {
-            return await _service.Delete(id);
+            return _service.Delete(id);
         }
 
         [HttpGet]
         [Description("编辑")]
-        public async Task<IResultModel> Edit([BindRequired]Guid id)
+        public Task<IResultModel> Edit([BindRequired]Guid id)
         {
-            return await _service.Edit(id);
+            return _service.Edit(id);
         }
 
         [HttpPost]
diff --git a/src/Web/Controllers/ModuleController.cs b/src/Web/Controllers/ModuleController.cs
index 0a6472b..747c0ae 100644
--- a/src/Web/Controllers/ModuleController.cs
+++ b/src/Web/Controllers/ModuleController.cs
@@ -30,9 +30,9 @@ public ModuleController(SystemConfigModel systemConfig, CodeGeneratorOptions cod
 
         [HttpGet]
         [Description("查询")]
-        public async Task<IResultModel> Query([FromQuery]ModuleQueryModel model)
+        public Task<IResultModel> Query([FromQuery]ModuleQueryModel model)
         {
-            return await _service.Query(model);
+            return _service.Query(model);
         }
 
         [HttpPost]
diff --git a/src/Web/Controllers/PropertyController.cs b/src/Web/Controllers/PropertyController.cs
index 24d2a10..7b36993 100644
--- a/src/Web/Controllers/PropertyController.cs
+++ b/src/Web/Controllers/PropertyController.cs
@@ -41,16 +41,16 @@ public Task<IResultModel> Add(PropertyAddModel model)
 
         [HttpDelete]
         [Description("删除")]
-        public async Task<IResultModel> Delete([BindRequired]Guid id)
+        public Task<IResultModel> Delete([BindRequired]Guid id)
         {
-            return await _service.Delete(id);
+            return _service.Delete(id);
         }
 
         [HttpGet]
         [Description("编辑")]
-        public async Task<IResultModel> Edit([BindRequired]Guid id)
+        public Task<IResultModel> Edit([BindRequired]Guid id)
         {
-            return await _service.Edit(id);
+            return _service.Edit(id);
         }
 
         [HttpPost]

From c747ce8dc1e6b5efff682a0695ee82f9be1fc55c Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Sat, 22 Feb 2020 16:50:30 +0800
Subject: [PATCH 24/71] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                            |  2 +-
 src/Library/Infrastructure/Infrastructure.csproj     |  8 ++++++++
 .../Default/T4/src/Web/ModuleInitializer.cs          | 12 +++++++++---
 .../Default/T4/src/Web/ModuleInitializer.tt          |  2 +-
 src/WebHost/_modules/CodeGenerator/_module.json      |  2 +-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 02883b3..c4bcd8c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.6.2</Version>
+    <Version>1.6.3</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 58b5169..f423c1e 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -722,4 +722,12 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Templates\Default\T4\src\Web\ModuleInitializer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ModuleInitializer.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
index c104885..172eb40 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
@@ -32,18 +32,25 @@ public virtual string TransformText()
             #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
+            #line default
+            #line hidden
+            this.Write(".Lib.Module.Abstractions;\r\nusing ");
+            
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            
             #line default
             #line hidden
             this.Write(".Lib.Module.AspNetCore;\r\n\r\nnamespace ");
             
-            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
@@ -75,7 +82,6 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env)
         /// <param name=""mvcOptions""></param>
         public void ConfigureMvc(MvcOptions mvcOptions)
         {
-            
         }
     }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
index 46b8ce1..d9a5194 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using <#= _prefix #>.Lib.Module.Abstractions;
 using <#= _prefix #>.Lib.Module.AspNetCore;
 
 namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Web
@@ -32,7 +33,6 @@ namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Web
         /// <param name="mvcOptions"></param>
         public void ConfigureMvc(MvcOptions mvcOptions)
         {
-            
         }
     }
 }
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index 57da871..137e03c 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.2"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.3"}

From 6d9a379391bd004cf553ab0f5f5807977e2f9948 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Sat, 22 Feb 2020 23:26:42 +0800
Subject: [PATCH 25/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/SQLite/Nm_Admin.db                       | Bin 167936 -> 167936 bytes
 data/SQLite/Nm_CodeGenerator.db               | Bin 61440 -> 61440 bytes
 src/Library/Domain/Domain.csproj              |   2 +-
 .../Infrastructure/Infrastructure.csproj      |   4 ++--
 src/UI/module-code-generator/package.json     |   8 ++++----
 src/Web/Web.csproj                            |   2 +-
 src/WebHost/WebHost.csproj                    |   4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index 739a82d0cfbd95ac4e26193fac65206836ed9e52..f531f028ac4c7be4685cfdc981194b7c34cc7496 100644
GIT binary patch
delta 92
zcmZozz}2vTYl1Xm^+XwG#_Gm|tqF`#^X)B7lTwWhOwBAT)67lG43m;9Q`1sR%u<Y#
vEtAZR%#w`^j0|)QjC74G6^x9nj0~&{4fHI55=Mr`ae;2Dw*Q>Z$o>HU{Qesm

delta 92
zcmZozz}2vTYl1Xm)kGO*#;V4ItqF`#^X-$3lg!P{3@lR843bO?Oj0e95-luKjLnS=
wQ<Kutl2VNfj0|)QjC2i66^x9nOwFu}Ec7f*EsV@8P2=ot>1_WwpOO6o02J^Wu>b%7

diff --git a/data/SQLite/Nm_CodeGenerator.db b/data/SQLite/Nm_CodeGenerator.db
index 71d5c2e4f755f3f76d68995466d2b56cd80059e5..4b24036ffcc0679896117ed082b8883a5d1b2b1c 100644
GIT binary patch
delta 455
zcma*jJxjwt90u^a#6o;YgGjryv=yUN@XEd9E|(&<xun5Om)l(&b+MC+rGq#s=@;-5
zRLSRXR-F1lL`_7+7ZA5U4-fo*JfoR8nwgh1SiP!8uzGuNy|-At1JIrTds4p7R$CXg
z7z@METEjJH>Gk<YN16o*^OG<@5)VQo#Xuqz@DPP6CYWHA_)4XAa~B%vV|}|uF~tZ|
zL}`n%F2!9=I>h&>Bz}6_*jo9O^CEZq06<neZo=_~`9`Q%mabS|2qD6OVn`@CKwg}S
zk|2qEhH>m+l0NUaDQUVTV|aKn%t3CWIDT+Qmx>ONm~oySHPDCVGZvT@nxzHj0YGO8
zoT+o3E%#5Ivpm>*pW;u4*)}!&&t?Vyp#8lV<YS^Z5*&FU&nYxcq$lmX2(r@tOD~(d
HdFs6aXb@@7

delta 33
pcmZp8z})bFd4e<}|3n#QM*fWn3;j1U7BD+3W+_nE%(CH+JpjY}3&Q{a

diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 614aeda..9f0c131 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Data.Core" Version="1.7.2" />
     <PackageReference Include="NetModular.Lib.Data.Query" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.7.3" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index f423c1e..2e5d343 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.7.2" />
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.7.3" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.7.4" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-code-generator/package.json
index a0e06e6..272c20c 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-code-generator/package.json
@@ -18,8 +18,8 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.1.9",
-    "netmodular-ui": "^1.4.6"
+    "netmodular-module-admin": "^1.2.3",
+    "netmodular-ui": "^1.5.3"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.2.2",
@@ -34,9 +34,9 @@
     "eslint-plugin-vue": "^5.0.0",
     "prettier": "^1.18.2",
     "raw-loader": "^3.1.0",
-    "rimraf": "^3.0.1",
+    "rimraf": "^3.0.2",
     "sass": "^1.25.0",
     "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.11"
   }
-}
\ No newline at end of file
+}
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index b029c66..d304f8d 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.7.2" />
     <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.7.3" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.7.2" />
   </ItemGroup>
   
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index d32a8e1..56c2784 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -14,8 +14,8 @@
     <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.7.2" />
     <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.7.2" />
     <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.7.2" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.7.4" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.7.4" />
   </ItemGroup>
 
   <ItemGroup>

From 592306e6e2f6c4c9bcbb390e32d3961667b70662 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Tue, 3 Mar 2020 14:13:08 +0800
Subject: [PATCH 26/71] update

---
 src/Library/Application/Application.csproj       |  2 +-
 src/Library/Domain/Domain.csproj                 |  6 +++---
 src/Library/Infrastructure/Infrastructure.csproj | 12 ++----------
 src/Web/Web.csproj                               |  4 ++--
 src/WebHost/WebHost.csproj                       | 10 +++++-----
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index df29635..1413446 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.7.5" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.7.2" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 9f0c131..28d4ce9 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.7.3" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.7.5" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.7.5" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.7.5" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 2e5d343..5b352f5 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.7.3" />
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.7.4" />
+    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.7.4" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.7.9" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
@@ -722,12 +722,4 @@
     </Compile>
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Templates\Default\T4\src\Web\ModuleInitializer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ModuleInitializer.tt</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
 </Project>
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index d304f8d..214fdb4 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -7,8 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.7.3" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.7.3" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.7.5" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.7.2" />
   </ItemGroup>
   
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 56c2784..ed45747 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -10,12 +10,12 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.7.5" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.7.5" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.7.5" />
     <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.7.4" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.7.4" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.7.7" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.7.9" />
   </ItemGroup>
 
   <ItemGroup>

From 30ef1385e02539852bb4050b3d4f4164f05e1d11 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Wed, 4 Mar 2020 12:47:15 +0800
Subject: [PATCH 27/71] update

---
 data/SQLite/Nm_Admin.db                       |   Bin 167936 -> 167936 bytes
 data/SQLite/Nm_CodeGenerator.db               |   Bin 61440 -> 69632 bytes
 src/Directory.Build.props                     |     2 +-
 .../ModuleService/ModuleService.cs            |     9 +-
 .../ViewModels/ModuleAddModel.cs              |    15 +
 .../IOnlineModuleService.cs                   |    50 +
 .../OnlineModuleService.cs                    |    78 +
 .../ViewModels/OnlineModuleAddModel.cs        |    58 +
 .../ViewModels/OnlineModuleUpdateModel.cs     |    15 +
 .../OnlineModuleService/_MapperConfig.cs      |    17 +
 src/Library/Domain/Module/ModuleEntity.cs     |    18 +
 .../OnlineModule/IOnlineModuleRepository.cs   |    21 +
 .../Models/OnlineModuleQueryModel.cs          |     9 +
 .../OnlineModule/OnlineModuleEntity.Extend.cs |     7 +
 .../Domain/OnlineModule/OnlineModuleEntity.cs |    65 +
 .../Infrastructure/Infrastructure.csproj      |    44 +
 .../NuGet/NuGetPackageVersions.cs             |    42 +
 .../Infrastructure/NuGet/NugetHelper.cs       |    83 +
 .../MySql/OnlineModuleRepository.cs           |    11 +
 .../PostgreSQL/OnlineModuleRepository.cs      |    11 +
 .../SQLite/OnlineModuleRepository.cs          |    11 +
 .../SqlServer/OnlineModuleRepository.cs       |    36 +
 .../Default/T4/src/DirectoryBuildProps.cs     |    28 +-
 .../Default/T4/src/DirectoryBuildProps.tt     |     8 +-
 .../src/Library/Application/Csproj.Extend.cs  |     3 +
 .../T4/src/Library/Application/Csproj.cs      |    21 +-
 .../T4/src/Library/Application/Csproj.tt      |     4 +-
 .../T4/src/Library/Domain/Csproj.Extend.cs    |     3 +
 .../Default/T4/src/Library/Domain/Csproj.cs   |    27 +-
 .../Default/T4/src/Library/Domain/Csproj.tt   |     6 +-
 .../Default/T4/src/Library/Domain/Entity.cs   |    70 +-
 .../Default/T4/src/Library/Domain/Entity.tt   |     6 +-
 .../Default/T4/src/UI/App/Eslintrc.cs         |     3 +-
 .../Default/T4/src/UI/App/Eslintrc.tt         |     3 +-
 .../Default/T4/src/Web/Csproj.Extend.cs       |     3 +
 .../Templates/Default/T4/src/Web/Csproj.cs    |    36 +-
 .../Templates/Default/T4/src/Web/Csproj.tt    |     8 +-
 .../Default/T4/src/WebHost/Csproj.Extend.cs   |     3 +
 .../Default/T4/src/WebHost/Csproj.cs          |    63 +-
 .../Default/T4/src/WebHost/Csproj.tt          |    14 +-
 .../Templates/Models/ModuleBuildModel.cs      |    15 +
 .../Templates/Models/TemplateBuildModel.cs    |     9 +-
 .../views/property/components/edit/index.vue  |   202 -
 .../.browserslistrc                           |     0
 .../.eslintrc.js                              |     3 +-
 .../.prettierrc                               |     0
 .../.vscode/settings.json                     |     0
 .../babel.config.js                           |     0
 src/UI/module-codegenerator/package-lock.json | 12129 ++++++++++++++++
 .../package.json                              |    24 +-
 .../postcss.config.js                         |     0
 .../src/api/components/class.js               |     0
 .../src/api/components/enum.js                |     0
 .../src/api/components/enumItem.js            |     0
 .../src/api/components/modelProperty.js       |     0
 .../src/api/components/module.js              |     0
 .../src/api/components/onlineModule.js        |    10 +
 .../src/api/components/property.js            |     0
 .../src/api/index.js                          |     0
 .../src/components/index.js                   |     0
 .../src/config/index.js                       |     0
 .../src/index.js                              |     0
 .../src/main.js                               |     0
 .../src/module.js                             |     0
 .../src/routes/index.js                       |     0
 .../src/store/index.js                        |     0
 .../class/components/code-preview/index.vue   |     0
 .../src/views/class/components/save/index.vue |     7 +-
 .../src/views/class/index/cols.js             |     0
 .../src/views/class/index/index.vue           |     0
 .../src/views/enum/components/save/index.vue  |    16 +-
 .../src/views/enum/components/select/index.js |     0
 .../src/views/enum/index/cols.js              |     0
 .../src/views/enum/index/index.vue            |     0
 .../src/views/enum/index/page.js              |     0
 .../views/enumItem/components/save/index.vue  |     4 +-
 .../src/views/enumItem/index/cols.js          |     0
 .../src/views/enumItem/index/index.vue        |     0
 .../modelProperty/components/add/index.vue    |     0
 .../modelProperty/components/edit/index.vue   |     0
 .../modelProperty/components/import/index.vue |     0
 .../modelProperty/components/list/cols.js     |     0
 .../modelProperty/components/list/index.vue   |     0
 .../src/views/modelProperty/index/index.vue   |     0
 .../views/module/components/save/index.vue    |    30 +-
 .../views/module/components/select/index.vue  |     0
 .../src/views/module/index/cols.js            |    12 +
 .../src/views/module/index/index.vue          |    31 +-
 .../src/views/module/index/page.js            |     0
 .../onlineModule/components/save/index.vue    |    73 +
 .../src/views/onlineModule/index/cols.js      |    44 +
 .../src/views/onlineModule/index/index.vue    |    99 +
 .../src/views/onlineModule/index/page.js      |    43 +
 .../views/property/components/save}/index.vue |    41 +-
 .../property/components/type-select/index.js  |     0
 .../src/views/property/index/cols.js          |     0
 .../src/views/property/index/index.vue        |    15 +-
 .../vue.config.js                             |     0
 src/Web/Controllers/OnlineModuleController.cs |    58 +
 src/Web/ModuleInitializer.cs                  |     1 -
 .../_modules/CodeGenerator/_module.json       |     2 +-
 101 files changed, 13430 insertions(+), 349 deletions(-)
 create mode 100644 src/Library/Application/OnlineModuleService/IOnlineModuleService.cs
 create mode 100644 src/Library/Application/OnlineModuleService/OnlineModuleService.cs
 create mode 100644 src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleAddModel.cs
 create mode 100644 src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleUpdateModel.cs
 create mode 100644 src/Library/Application/OnlineModuleService/_MapperConfig.cs
 create mode 100644 src/Library/Domain/OnlineModule/IOnlineModuleRepository.cs
 create mode 100644 src/Library/Domain/OnlineModule/Models/OnlineModuleQueryModel.cs
 create mode 100644 src/Library/Domain/OnlineModule/OnlineModuleEntity.Extend.cs
 create mode 100644 src/Library/Domain/OnlineModule/OnlineModuleEntity.cs
 create mode 100644 src/Library/Infrastructure/NuGet/NuGetPackageVersions.cs
 create mode 100644 src/Library/Infrastructure/NuGet/NugetHelper.cs
 create mode 100644 src/Library/Infrastructure/Repositories/MySql/OnlineModuleRepository.cs
 create mode 100644 src/Library/Infrastructure/Repositories/PostgreSQL/OnlineModuleRepository.cs
 create mode 100644 src/Library/Infrastructure/Repositories/SQLite/OnlineModuleRepository.cs
 create mode 100644 src/Library/Infrastructure/Repositories/SqlServer/OnlineModuleRepository.cs
 delete mode 100644 src/UI/module-code-generator/src/views/property/components/edit/index.vue
 rename src/UI/{module-code-generator => module-codegenerator}/.browserslistrc (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/.eslintrc.js (87%)
 rename src/UI/{module-code-generator => module-codegenerator}/.prettierrc (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/.vscode/settings.json (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/babel.config.js (100%)
 create mode 100644 src/UI/module-codegenerator/package-lock.json
 rename src/UI/{module-code-generator => module-codegenerator}/package.json (69%)
 rename src/UI/{module-code-generator => module-codegenerator}/postcss.config.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/api/components/class.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/api/components/enum.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/api/components/enumItem.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/api/components/modelProperty.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/api/components/module.js (100%)
 create mode 100644 src/UI/module-codegenerator/src/api/components/onlineModule.js
 rename src/UI/{module-code-generator => module-codegenerator}/src/api/components/property.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/api/index.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/components/index.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/config/index.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/index.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/main.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/module.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/routes/index.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/store/index.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/class/components/code-preview/index.vue (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/class/components/save/index.vue (90%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/class/index/cols.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/class/index/index.vue (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/enum/components/save/index.vue (75%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/enum/components/select/index.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/enum/index/cols.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/enum/index/index.vue (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/enum/index/page.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/enumItem/components/save/index.vue (95%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/enumItem/index/cols.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/enumItem/index/index.vue (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/modelProperty/components/add/index.vue (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/modelProperty/components/edit/index.vue (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/modelProperty/components/import/index.vue (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/modelProperty/components/list/cols.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/modelProperty/components/list/index.vue (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/modelProperty/index/index.vue (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/module/components/save/index.vue (64%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/module/components/select/index.vue (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/module/index/cols.js (74%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/module/index/index.vue (61%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/module/index/page.js (100%)
 create mode 100644 src/UI/module-codegenerator/src/views/onlineModule/components/save/index.vue
 create mode 100644 src/UI/module-codegenerator/src/views/onlineModule/index/cols.js
 create mode 100644 src/UI/module-codegenerator/src/views/onlineModule/index/index.vue
 create mode 100644 src/UI/module-codegenerator/src/views/onlineModule/index/page.js
 rename src/UI/{module-code-generator/src/views/property/components/add => module-codegenerator/src/views/property/components/save}/index.vue (91%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/property/components/type-select/index.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/property/index/cols.js (100%)
 rename src/UI/{module-code-generator => module-codegenerator}/src/views/property/index/index.vue (90%)
 rename src/UI/{module-code-generator => module-codegenerator}/vue.config.js (100%)
 create mode 100644 src/Web/Controllers/OnlineModuleController.cs

diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index f531f028ac4c7be4685cfdc981194b7c34cc7496..ae59b912e5ff88766e0f45566af2f7b4af816a56 100644
GIT binary patch
delta 92
zcmZozz}2vTYl1Xm%|sbz#+t^2tqF`#^X-!?O$^PF&CHVx(kxAq42+U2EewnkQw=PV
wOf3ye4NZ&;j0|)QjCBnS6pW0mjEt-d%=9cQOiYZ;jN{_U<hK8u&&d7(0N>>rB>(^b

delta 92
zcmZozz}2vTYl1Xm^+XwG#_Gm|tqF`#^X)B7lTwWhOwBAT)67lG43m;9Q`1sR%u<Y#
vEtAZR%#w`^j0|)QjC74G6^x9nj0~&{4fHI55=Mr`ae;2Dw*Q>Z$o>HU{Qesm

diff --git a/data/SQLite/Nm_CodeGenerator.db b/data/SQLite/Nm_CodeGenerator.db
index 4b24036ffcc0679896117ed082b8883a5d1b2b1c..208a7f9829b2fd5ce3be1ec34996d22984863c5a 100644
GIT binary patch
literal 69632
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
X0SG_<0uX=z1pW&GyZZkFuTcC4M$mKl

literal 61440
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

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index c4bcd8c..08d3ffc 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.6.3</Version>
+    <Version>1.6.4</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/ModuleService/ModuleService.cs b/src/Library/Application/ModuleService/ModuleService.cs
index 992a407..b71cfc4 100644
--- a/src/Library/Application/ModuleService/ModuleService.cs
+++ b/src/Library/Application/ModuleService/ModuleService.cs
@@ -7,7 +7,6 @@
 using AutoMapper;
 using NetModular.Lib.Utils.Core.Extensions;
 using NetModular.Lib.Utils.Core.Result;
-using NetModular.Lib.Utils.Core.SystemConfig;
 using NetModular.Module.CodeGenerator.Application.ModuleService.ResultModels;
 using NetModular.Module.CodeGenerator.Application.ModuleService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Class;
@@ -19,6 +18,7 @@
 using NetModular.Module.CodeGenerator.Domain.Module.Models;
 using NetModular.Module.CodeGenerator.Domain.Property;
 using NetModular.Module.CodeGenerator.Infrastructure;
+using NetModular.Module.CodeGenerator.Infrastructure.NuGet;
 using NetModular.Module.CodeGenerator.Infrastructure.Repositories;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Default;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
@@ -37,9 +37,9 @@ public class ModuleService : IModuleService
         private readonly IClassMethodRepository _classMethodRepository;
         private readonly CodeGeneratorDbContext _dbContext;
         private readonly CodeGeneratorOptions _codeGeneratorOptions;
-        private readonly SystemConfigModel _systemConfig;
+        private readonly NugetHelper _nugetHelper;
 
-        public ModuleService(IModuleRepository repository, IMapper mapper, IClassRepository classRepository, IPropertyRepository propertyRepository, IEnumRepository enumRepository, IEnumItemRepository enumItemRepository, IModelPropertyRepository modelPropertyRepository, IClassMethodRepository classMethodRepository, CodeGeneratorDbContext dbContext, CodeGeneratorOptions codeGeneratorOptions, SystemConfigModel systemConfig)
+        public ModuleService(IModuleRepository repository, IMapper mapper, IClassRepository classRepository, IPropertyRepository propertyRepository, IEnumRepository enumRepository, IEnumItemRepository enumItemRepository, IModelPropertyRepository modelPropertyRepository, IClassMethodRepository classMethodRepository, CodeGeneratorDbContext dbContext, CodeGeneratorOptions codeGeneratorOptions, NugetHelper nugetHelper)
         {
             _repository = repository;
             _mapper = mapper;
@@ -51,7 +51,7 @@ public ModuleService(IModuleRepository repository, IMapper mapper, IClassReposit
             _classMethodRepository = classMethodRepository;
             _dbContext = dbContext;
             _codeGeneratorOptions = codeGeneratorOptions;
-            _systemConfig = systemConfig;
+            _nugetHelper = nugetHelper;
         }
 
         public async Task<IResultModel> Query(ModuleQueryModel model)
@@ -149,6 +149,7 @@ public async Task<IResultModel<ModuleBuildCodeResultModel>> BuildCode(Guid modul
             var buildModel = new TemplateBuildModel
             {
                 RootPath = Path.Combine(rootPath, id, moduleFullName),
+                NuGetPackageVersions = _nugetHelper.GetVersions()
             };
 
             if (classList == null)
diff --git a/src/Library/Application/ModuleService/ViewModels/ModuleAddModel.cs b/src/Library/Application/ModuleService/ViewModels/ModuleAddModel.cs
index cbc3171..6e30851 100644
--- a/src/Library/Application/ModuleService/ViewModels/ModuleAddModel.cs
+++ b/src/Library/Application/ModuleService/ViewModels/ModuleAddModel.cs
@@ -35,5 +35,20 @@ public class ModuleAddModel
         /// 版权声明
         /// </summary>
         public string Copyright { get; set; }
+
+        /// <summary>
+        /// 公司单位
+        /// </summary>
+        public string Company { get; set; }
+
+        /// <summary>
+        /// 官方地址
+        /// </summary>
+        public string ProjectUrl { get; set; }
+
+        /// <summary>
+        /// 仓库地址
+        /// </summary>
+        public string RepositoryUrl { get; set; }
     }
 }
diff --git a/src/Library/Application/OnlineModuleService/IOnlineModuleService.cs b/src/Library/Application/OnlineModuleService/IOnlineModuleService.cs
new file mode 100644
index 0000000..a5d0881
--- /dev/null
+++ b/src/Library/Application/OnlineModuleService/IOnlineModuleService.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Threading.Tasks;
+using NetModular.Lib.Utils.Core.Result;
+using NetModular.Module.CodeGenerator.Application.OnlineModuleService.ViewModels;
+using NetModular.Module.CodeGenerator.Domain.OnlineModule.Models;
+
+namespace NetModular.Module.CodeGenerator.Application.OnlineModuleService
+{
+    /// <summary>
+    /// 在线模块服务
+    /// </summary>
+    public interface IOnlineModuleService
+    {
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        Task<IResultModel> Query(OnlineModuleQueryModel model);
+
+        /// <summary>
+        /// 创建
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        Task<IResultModel> Add(OnlineModuleAddModel model);
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="id">编号</param>
+        /// <returns></returns>
+        Task<IResultModel> Delete(Guid id);
+
+        /// <summary>
+        /// 编辑
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<IResultModel> Edit(Guid id);
+
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        Task<IResultModel> Update(OnlineModuleUpdateModel model);
+
+    }
+}
diff --git a/src/Library/Application/OnlineModuleService/OnlineModuleService.cs b/src/Library/Application/OnlineModuleService/OnlineModuleService.cs
new file mode 100644
index 0000000..f107bb5
--- /dev/null
+++ b/src/Library/Application/OnlineModuleService/OnlineModuleService.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using AutoMapper;
+using NetModular.Lib.Utils.Core.Result;
+using NetModular.Module.CodeGenerator.Application.OnlineModuleService.ViewModels;
+using NetModular.Module.CodeGenerator.Domain.OnlineModule;
+using NetModular.Module.CodeGenerator.Domain.OnlineModule.Models;
+
+namespace NetModular.Module.CodeGenerator.Application.OnlineModuleService
+{
+    public class OnlineModuleService : IOnlineModuleService
+    {
+        private readonly IMapper _mapper;
+        private readonly IOnlineModuleRepository _repository;
+        public OnlineModuleService(IMapper mapper, IOnlineModuleRepository repository)
+        {
+            _mapper = mapper;
+            _repository = repository;
+        }
+
+        public async Task<IResultModel> Query(OnlineModuleQueryModel model)
+        {
+            var result = new QueryResultModel<OnlineModuleEntity>
+            {
+                Rows = await _repository.Query(model),
+                Total = model.TotalCount
+            };
+            return ResultModel.Success(result);
+        }
+
+        public async Task<IResultModel> Add(OnlineModuleAddModel model)
+        {
+            var entity = _mapper.Map<OnlineModuleEntity>(model);
+            //if (await _repository.Exists(entity))
+            //{
+                //return ResultModel.HasExists;
+            //}
+
+            var result = await _repository.AddAsync(entity);
+            return ResultModel.Result(result);
+        }
+
+        public async Task<IResultModel> Delete(Guid id)
+        {
+            var result = await _repository.DeleteAsync(id);
+            return ResultModel.Result(result);
+        }
+
+        public async Task<IResultModel> Edit(Guid id)
+        {
+            var entity = await _repository.GetAsync(id);
+            if (entity == null)
+                return ResultModel.NotExists;
+
+            var model = _mapper.Map<OnlineModuleUpdateModel>(entity);
+            return ResultModel.Success(model);
+        }
+
+        public async Task<IResultModel> Update(OnlineModuleUpdateModel model)
+        {
+            var entity = await _repository.GetAsync(model.Id);
+            if (entity == null)
+                return ResultModel.NotExists;
+
+            _mapper.Map(model, entity);
+
+            //if (await _repository.Exists(entity))
+            //{
+                //return ResultModel.HasExists;
+            //}
+
+            var result = await _repository.UpdateAsync(entity);
+
+            return ResultModel.Result(result);
+        }
+    }
+}
diff --git a/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleAddModel.cs b/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleAddModel.cs
new file mode 100644
index 0000000..3801839
--- /dev/null
+++ b/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleAddModel.cs
@@ -0,0 +1,58 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using NetModular.Module.CodeGenerator.Domain.OnlineModule;
+
+namespace NetModular.Module.CodeGenerator.Application.OnlineModuleService.ViewModels
+{
+    /// <summary>
+    /// 在线模块添加模型
+    /// </summary>
+    public class OnlineModuleAddModel
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 编码
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 图标
+        /// </summary>
+        public string Icon { get; set; }
+
+        /// <summary>
+        /// 介绍说明
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// NuGet包ID
+        /// </summary>
+        public string NuGetId { get; set; }
+
+        /// <summary>
+        /// NPM包ID
+        /// </summary>
+        public string NpmId { get; set; }
+
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string Company { get; set; }
+
+        /// <summary>
+        /// 项目地址
+        /// </summary>
+        public string ProjectUrl { get; set; }
+
+        /// <summary>
+        /// 仓库地址
+        /// </summary>
+        public string RepositoryUrl { get; set; }
+
+    }
+}
diff --git a/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleUpdateModel.cs b/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleUpdateModel.cs
new file mode 100644
index 0000000..9529964
--- /dev/null
+++ b/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleUpdateModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using NetModular.Module.CodeGenerator.Domain.OnlineModule;
+
+namespace NetModular.Module.CodeGenerator.Application.OnlineModuleService.ViewModels
+{
+    /// <summary>
+    /// 在线模块添加模型
+    /// </summary>
+    public class OnlineModuleUpdateModel : OnlineModuleAddModel
+    {
+        [Required(ErrorMessage = "请选择要修改的在线模块")]
+        public Guid Id { get; set; }
+    }
+}
diff --git a/src/Library/Application/OnlineModuleService/_MapperConfig.cs b/src/Library/Application/OnlineModuleService/_MapperConfig.cs
new file mode 100644
index 0000000..a87c02c
--- /dev/null
+++ b/src/Library/Application/OnlineModuleService/_MapperConfig.cs
@@ -0,0 +1,17 @@
+using AutoMapper;
+using NetModular.Lib.Mapper.AutoMapper;
+using NetModular.Module.CodeGenerator.Application.OnlineModuleService.ViewModels;
+using NetModular.Module.CodeGenerator.Domain.OnlineModule;
+
+namespace NetModular.Module.CodeGenerator.Application.OnlineModuleService
+{
+    public class MapperConfig : IMapperConfig
+    {
+        public void Bind(IMapperConfigurationExpression cfg)
+        {
+            cfg.CreateMap<OnlineModuleAddModel, OnlineModuleEntity>();
+            cfg.CreateMap<OnlineModuleEntity, OnlineModuleUpdateModel>();
+            cfg.CreateMap<OnlineModuleUpdateModel, OnlineModuleEntity>();
+        }
+    }
+}
diff --git a/src/Library/Domain/Module/ModuleEntity.cs b/src/Library/Domain/Module/ModuleEntity.cs
index 87530fc..79fd6db 100644
--- a/src/Library/Domain/Module/ModuleEntity.cs
+++ b/src/Library/Domain/Module/ModuleEntity.cs
@@ -37,5 +37,23 @@ public partial class ModuleEntity : EntityBaseWithSoftDelete
         [Nullable]
         [Length(200)]
         public string Copyright { get; set; }
+
+        /// <summary>
+        /// 公司单位
+        /// </summary>
+        [Nullable]
+        public string Company { get; set; }
+
+        /// <summary>
+        /// 官方地址
+        /// </summary>
+        [Nullable]
+        public string ProjectUrl { get; set; }
+
+        /// <summary>
+        /// 仓库地址
+        /// </summary>
+        [Nullable]
+        public string RepositoryUrl { get; set; }
     }
 }
diff --git a/src/Library/Domain/OnlineModule/IOnlineModuleRepository.cs b/src/Library/Domain/OnlineModule/IOnlineModuleRepository.cs
new file mode 100644
index 0000000..7f87d20
--- /dev/null
+++ b/src/Library/Domain/OnlineModule/IOnlineModuleRepository.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using NetModular.Lib.Data.Abstractions;
+using NetModular.Lib.Data.Abstractions.Pagination;
+using NetModular.Module.CodeGenerator.Domain.OnlineModule.Models;
+
+namespace NetModular.Module.CodeGenerator.Domain.OnlineModule
+{
+    /// <summary>
+    /// 在线模块仓储
+    /// </summary>
+    public interface IOnlineModuleRepository : IRepository<OnlineModuleEntity>
+    {
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        Task<IList<OnlineModuleEntity>> Query(OnlineModuleQueryModel model);
+    }
+}
diff --git a/src/Library/Domain/OnlineModule/Models/OnlineModuleQueryModel.cs b/src/Library/Domain/OnlineModule/Models/OnlineModuleQueryModel.cs
new file mode 100644
index 0000000..828158c
--- /dev/null
+++ b/src/Library/Domain/OnlineModule/Models/OnlineModuleQueryModel.cs
@@ -0,0 +1,9 @@
+using System;
+using NetModular.Lib.Data.Query;
+
+namespace  NetModular.Module.CodeGenerator.Domain.OnlineModule.Models
+{
+    public class OnlineModuleQueryModel : QueryModel
+    {
+    }
+}
diff --git a/src/Library/Domain/OnlineModule/OnlineModuleEntity.Extend.cs b/src/Library/Domain/OnlineModule/OnlineModuleEntity.Extend.cs
new file mode 100644
index 0000000..853224e
--- /dev/null
+++ b/src/Library/Domain/OnlineModule/OnlineModuleEntity.Extend.cs
@@ -0,0 +1,7 @@
+namespace NetModular.Module.CodeGenerator.Domain.OnlineModule
+{
+    public partial class OnlineModuleEntity
+    {
+
+    }
+}
diff --git a/src/Library/Domain/OnlineModule/OnlineModuleEntity.cs b/src/Library/Domain/OnlineModule/OnlineModuleEntity.cs
new file mode 100644
index 0000000..5636e57
--- /dev/null
+++ b/src/Library/Domain/OnlineModule/OnlineModuleEntity.cs
@@ -0,0 +1,65 @@
+using NetModular.Lib.Data.Abstractions.Attributes;
+using NetModular.Lib.Data.Core.Entities;
+
+namespace NetModular.Module.CodeGenerator.Domain.OnlineModule
+{
+    /// <summary>
+    /// 在线模块
+    /// </summary>
+    [Table("Online_Module")]
+    public partial class OnlineModuleEntity : Entity
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 编码
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 图标
+        /// </summary>
+        public string Icon { get; set; }
+
+        /// <summary>
+        /// 介绍说明
+        /// </summary>
+		[Nullable]
+        [Length(500)]
+        public string Description { get; set; }
+
+        /// <summary>
+        /// NuGet包ID
+        /// </summary>
+        [Length(200)]
+        public string NuGetId { get; set; }
+
+        /// <summary>
+        /// NPM包ID
+        /// </summary>
+        [Length(200)]
+        public string NpmId { get; set; }
+
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        [Length(200)]
+        public string Company { get; set; }
+
+        /// <summary>
+        /// 项目地址
+        /// </summary>
+        [Length(300)]
+        public string ProjectUrl { get; set; }
+
+        /// <summary>
+        /// 仓库地址
+        /// </summary>
+        [Length(300)]
+        public string RepositoryUrl { get; set; }
+
+    }
+}
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 5b352f5..76af7d5 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" />
     <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.7.4" />
     <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.7.9" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
@@ -722,4 +723,47 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Templates\Default\T4\src\DirectoryBuildProps.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>DirectoryBuildProps.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\Library\Application\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\Library\Domain\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\Library\Domain\Entity.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Entity.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\Eslintrc.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Eslintrc.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\WebHost\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\Web\Csproj.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Csproj.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Library/Infrastructure/NuGet/NuGetPackageVersions.cs b/src/Library/Infrastructure/NuGet/NuGetPackageVersions.cs
new file mode 100644
index 0000000..e521aa1
--- /dev/null
+++ b/src/Library/Infrastructure/NuGet/NuGetPackageVersions.cs
@@ -0,0 +1,42 @@
+namespace NetModular.Module.CodeGenerator.Infrastructure.NuGet
+{
+    /// <summary>
+    /// Nuget包版本信息
+    /// </summary>
+    public class NuGetPackageVersions
+    {
+        public string Lib_Utils_Core { get; set; }
+
+        public string Lib_Utils_Mvc { get; set; }
+
+        public string Lib_Data_Core { get; set; }
+
+        public string Lib_Data_Query { get; set; }
+
+        public string Lib_Data_MySql { get; set; }
+
+        public string Lib_Data_SQLite { get; set; }
+
+        public string Lib_Data_SqlServer { get; set; }
+
+        public string Lib_Options_Abstraction { get; set; }
+
+        public string Lib_Mapper_AutoMapper { get; set; }
+
+        public string Lib_Auth_Web { get; set; }
+
+        public string Lib_Module_AspNetCore { get; set; }
+
+        public string Lib_Validation_FluentValidation { get; set; }
+
+        public string Lib_Cache_MemoryCache { get; set; }
+
+        public string Lib_Excel_EPPlus { get; set; }
+
+        public string Lib_Host_Web { get; set; }
+
+        public string Module_Admin_Domain { get; set; }
+
+        public string Module_Admin_Web { get; set; }
+    }
+}
diff --git a/src/Library/Infrastructure/NuGet/NugetHelper.cs b/src/Library/Infrastructure/NuGet/NugetHelper.cs
new file mode 100644
index 0000000..d762a91
--- /dev/null
+++ b/src/Library/Infrastructure/NuGet/NugetHelper.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using NetModular.Lib.Utils.Core.Attributes;
+using NetModular.Lib.Utils.Core.Extensions;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.NuGet
+{
+    /// <summary>
+    /// NuGet帮助类
+    /// </summary>
+    [Singleton]
+    public class NugetHelper
+    {
+        private const string QueryUrl = "https://azuresearch-usnc.nuget.org/query?q={0}&take=1";
+        private readonly Dictionary<string, PropertyInfo> _infos = new Dictionary<string, PropertyInfo>();
+        private readonly HttpClient _client;
+        private readonly ILogger _logger;
+        private NuGetPackageVersions _versions;
+        private DateTime _lastSearchTime = DateTime.Now;
+
+        public NugetHelper(CodeGeneratorOptions options, IHttpClientFactory clientFactory, ILogger<NugetHelper> logger)
+        {
+            _logger = logger;
+            _client = clientFactory.CreateClient();
+
+            var properties = typeof(NuGetPackageVersions).GetProperties();
+            foreach (var propertyInfo in properties)
+            {
+                var name = $"{options.Prefix}.{propertyInfo.Name.Replace("_", ".")}";
+                _infos.Add(name, propertyInfo);
+            }
+        }
+
+        /// <summary>
+        /// 获取最新包版本信息
+        /// </summary>
+        /// <returns></returns>
+        public NuGetPackageVersions GetVersions()
+        {
+            //加个缓存机制，2小时
+            if (_lastSearchTime.AddHours(2) > DateTime.Now && _versions != null)
+                return _versions;
+
+            _versions = new NuGetPackageVersions();
+            var tasks = new Dictionary<PropertyInfo, Task<string>>();
+            foreach (var info in _infos)
+            {
+                tasks.Add(info.Value, GetVersion(info.Key));
+            }
+
+            Task.WaitAll(tasks.Values.ToArray());
+
+            foreach (var task in tasks)
+            {
+                task.Key.SetValue(_versions, task.Value.Result);
+            }
+
+            return _versions;
+        }
+
+        /// <summary>
+        /// 查询指定包ID的最新版本号
+        /// </summary>
+        /// <param name="packageId"></param>
+        /// <returns></returns>
+        public async Task<string> GetVersion(string packageId)
+        {
+            var url = string.Format(QueryUrl, packageId);
+            var jsonStr = await _client.GetStringAsync(url);
+            if (jsonStr.NotNull())
+            {
+                return jsonStr.Substring(jsonStr.IndexOf("\"version\":\"", StringComparison.Ordinal) + 11, 5);
+            }
+
+            return "";
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Repositories/MySql/OnlineModuleRepository.cs b/src/Library/Infrastructure/Repositories/MySql/OnlineModuleRepository.cs
new file mode 100644
index 0000000..ed756b3
--- /dev/null
+++ b/src/Library/Infrastructure/Repositories/MySql/OnlineModuleRepository.cs
@@ -0,0 +1,11 @@
+using NetModular.Lib.Data.Abstractions;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.MySql
+{
+    public class OnlineModuleRepository : SqlServer.OnlineModuleRepository
+    {
+        public OnlineModuleRepository(IDbContext dbContext) : base(dbContext)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Repositories/PostgreSQL/OnlineModuleRepository.cs b/src/Library/Infrastructure/Repositories/PostgreSQL/OnlineModuleRepository.cs
new file mode 100644
index 0000000..e742fd5
--- /dev/null
+++ b/src/Library/Infrastructure/Repositories/PostgreSQL/OnlineModuleRepository.cs
@@ -0,0 +1,11 @@
+    using NetModular.Lib.Data.Abstractions;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.PostgreSQL
+{
+    public class OnlineModuleRepository : SqlServer.OnlineModuleRepository
+    {
+        public OnlineModuleRepository(IDbContext dbContext) : base(dbContext)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Repositories/SQLite/OnlineModuleRepository.cs b/src/Library/Infrastructure/Repositories/SQLite/OnlineModuleRepository.cs
new file mode 100644
index 0000000..b4ac4f2
--- /dev/null
+++ b/src/Library/Infrastructure/Repositories/SQLite/OnlineModuleRepository.cs
@@ -0,0 +1,11 @@
+using NetModular.Lib.Data.Abstractions;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.SQLite
+{
+    public class OnlineModuleRepository : SqlServer.OnlineModuleRepository
+    {
+        public OnlineModuleRepository(IDbContext dbContext) : base(dbContext)
+        {
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Repositories/SqlServer/OnlineModuleRepository.cs b/src/Library/Infrastructure/Repositories/SqlServer/OnlineModuleRepository.cs
new file mode 100644
index 0000000..12fac92
--- /dev/null
+++ b/src/Library/Infrastructure/Repositories/SqlServer/OnlineModuleRepository.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NetModular.Lib.Data.Abstractions;
+using NetModular.Lib.Data.Core;
+using NetModular.Lib.Data.Query;
+using NetModular.Module.CodeGenerator.Domain.OnlineModule;
+using NetModular.Module.CodeGenerator.Domain.OnlineModule.Models;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.SqlServer
+{
+    public class OnlineModuleRepository : RepositoryAbstract<OnlineModuleEntity>, IOnlineModuleRepository
+    {
+        public OnlineModuleRepository(IDbContext context) : base(context)
+        {
+        }
+
+        public async Task<IList<OnlineModuleEntity>> Query(OnlineModuleQueryModel model)
+        {
+            var paging = model.Paging();
+
+            var query = Db.Find();
+
+            if (!paging.OrderBy.Any())
+            {
+                query.OrderByDescending(m => m.Id);
+            }
+
+            var result = await query.PaginationAsync(paging);
+
+            model.TotalCount = paging.TotalCount;
+
+            return result;
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
index 89c7392..c8cb43f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
@@ -62,13 +62,31 @@ public virtual string TransformText()
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <!--设置打包路径-->
     <PackageOutputPath>$(SolutionDir)\_packages</PackageOutputPath>
-    <Company>Oldli</Company>
-    <Copyright>Oldli</Copyright>
-    <PackageProjectUrl>https://docs.17mkh.com/</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/iamoldli/NetModular.Module.");
+    <Company>");
+            
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Company));
+            
+            #line default
+            #line hidden
+            this.Write("</Company>\r\n    <Copyright>");
+            
+            #line 20 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Copyright));
+            
+            #line default
+            #line hidden
+            this.Write("</Copyright>\r\n    <PackageProjectUrl>");
+            
+            #line 21 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.ProjectUrl));
+            
+            #line default
+            #line hidden
+            this.Write("</PackageProjectUrl>\r\n    <RepositoryUrl>");
             
             #line 22 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.RepositoryUrl));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
index 52dc436..6859323 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
@@ -16,9 +16,9 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <!--设置打包路径-->
     <PackageOutputPath>$(SolutionDir)\_packages</PackageOutputPath>
-    <Company>Oldli</Company>
-    <Copyright>Oldli</Copyright>
-    <PackageProjectUrl>https://docs.17mkh.com/</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/iamoldli/NetModular.Module.<#= _model.Module.Code #></RepositoryUrl>
+    <Company><#= _model.Module.Company #></Company>
+    <Copyright><#= _model.Module.Copyright #></Copyright>
+    <PackageProjectUrl><#= _model.Module.ProjectUrl #></PackageProjectUrl>
+    <RepositoryUrl><#= _model.Module.RepositoryUrl #></RepositoryUrl>
   </PropertyGroup>
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs
index 8860548..dfa72ff 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.Extend.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using NetModular.Module.CodeGenerator.Infrastructure.NuGet;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Application
@@ -7,11 +8,13 @@ public partial class Csproj : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
         private readonly string _prefix;
+        private readonly NuGetPackageVersions _versions;
 
         public Csproj(TemplateBuildModel model)
         {
             _model = model;
             _prefix = model.Module.Prefix;
+            _versions = _model.NuGetPackageVersions;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
index 439327b..9b5c888 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
@@ -34,16 +34,29 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Query\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Query\" Version=\"");
+            
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Data_Query));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Mapper.AutoMapper\" Version=\"1.7.0\" />\r\n  </ItemGroup>\r\n\r\n  <ItemGroup>\r\n    " +
-                    "<ProjectReference Include=\"..\\Infrastructure\\Infrastructure.csproj\" />\r\n  </Item" +
-                    "Group>\r\n\r\n</Project>\r\n");
+            this.Write(".Lib.Mapper.AutoMapper\" Version=\"");
+            
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Mapper_AutoMapper));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n  </ItemGroup>\r\n\r\n  <ItemGroup>\r\n    <ProjectReference Include=\"..\\Infrastr" +
+                    "ucture\\Infrastructure.csproj\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
index 7427804..cd02138 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.7.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Mapper.AutoMapper" Version="1.7.0" />
+	<PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="<#= _versions.Lib_Data_Query #>" />
+    <PackageReference Include="<#= _prefix #>.Lib.Mapper.AutoMapper" Version="<#= _versions.Lib_Mapper_AutoMapper #>" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs
index 5d8e6bc..33f09bd 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.Extend.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using NetModular.Module.CodeGenerator.Infrastructure.NuGet;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Domain
@@ -7,11 +8,13 @@ public partial class Csproj : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
         private readonly string _prefix;
+        private readonly NuGetPackageVersions _versions;
 
         public Csproj(TemplateBuildModel model)
         {
             _model = model;
             _prefix = model.Module.Prefix;
+            _versions = _model.NuGetPackageVersions;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
index 94fc20b..1d62828 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
@@ -34,21 +34,42 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Core\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Core\" Version=\"");
+            
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Data_Core));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Query\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.Query\" Version=\"");
+            
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Data_Query));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
             
             #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Core\" Version=\"1.7.1\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n\r\n");
+            this.Write(".Lib.Utils.Core\" Version=\"");
+            
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Utils_Core));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
index f6a1f58..3679ec6 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Lib.Data.Core" Version="1.7.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="1.7.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="1.7.1" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.Core" Version="<#= _versions.Lib_Data_Core #>" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="<#= _versions.Lib_Data_Query #>" />
+    <PackageReference Include="<#= _prefix #>.Lib.Utils.Core" Version="<#= _versions.Lib_Utils_Core #>" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.cs
index cdff8d2..d76b2b0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.cs
@@ -17,7 +17,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Entity : EntityBase
     {
@@ -29,199 +29,205 @@ public virtual string TransformText()
         {
             this.Write("using System;\r\nusing ");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Abstractions.Attributes;\r\n");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
  if(_baseEntityName=="IEntity" || _baseEntityName=="Entity" || _baseEntityName.StartsWith("Entity<")){ 
             
             #line default
             #line hidden
             this.Write("using ");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Core.Entities;\r\n");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
 }else{ 
             
             #line default
             #line hidden
             this.Write("using ");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Core.Entities.Extend;\r\n");
             
-            #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
 } 
             
             #line default
             #line hidden
             this.Write("\r\nnamespace ");
             
-            #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("\r\n{\r\n    /// <summary>\r\n    /// ");
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Remarks));
             
             #line default
             #line hidden
             this.Write("\r\n    /// </summary>\r\n    [Table(\"");
             
-            #line 17 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.TableName));
             
             #line default
             #line hidden
             this.Write("\")]\r\n    public partial class ");
             
-            #line 18 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 18 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Entity : ");
             
-            #line 18 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 18 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_baseEntityName));
             
             #line default
             #line hidden
             this.Write("\r\n    {\r\n");
             
-            #line 20 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 20 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
  foreach(var p in _propertyList){ if(p.IsInherit) continue;
             
             #line default
             #line hidden
             this.Write("        /// <summary>\r\n        /// ");
             
-            #line 22 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 22 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
             
             #line default
             #line hidden
             this.Write("\r\n        /// </summary>\r\n");
             
-            #line 24 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
- if(p.Nullable){ 
+            #line 24 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+ if(p.Nullable && p.Type == PropertyType.String){ 
             
             #line default
             #line hidden
             this.Write("\t\t[Nullable]\r\n");
             
-            #line 26 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 26 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
  } 
             
             #line default
             #line hidden
             
-            #line 27 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 27 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
  if(p.Type == PropertyType.String){ 
             
             #line default
             #line hidden
             
-            #line 28 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 28 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
  if(p.Length == 0){ 
             
             #line default
             #line hidden
             this.Write("\t\t[Max]\r\n");
             
-            #line 30 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
- } else { 
+            #line 30 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+ } else if(p.Length !=50) { 
             
             #line default
             #line hidden
             this.Write("        [Length(");
             
-            #line 31 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 31 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Length));
             
             #line default
             #line hidden
             this.Write(")]\r\n");
             
-            #line 32 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 32 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
  } 
             
             #line default
             #line hidden
             
-            #line 33 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 33 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
  } 
             
             #line default
             #line hidden
             
-            #line 34 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 34 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
  if(p.Type == PropertyType.Decimal||p.Type == PropertyType.Double){ 
             
             #line default
             #line hidden
             this.Write("\t\t[Precision]\r\n");
             
-            #line 36 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 36 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
  } 
             
             #line default
             #line hidden
             this.Write("        public ");
             
-            #line 37 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 37 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Type == PropertyType.Enum ? p.Enum.Name : p.Type.ToDescription()));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 37 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 37 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Name));
             
+            #line default
+            #line hidden
+            
+            #line 37 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(p.Nullable && p.Type != PropertyType.String ? "?" : ""));
+            
             #line default
             #line hidden
             this.Write(" { get; set; }");
             
-            #line 37 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 37 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(GetDefaultValue(p)));
             
             #line default
             #line hidden
             this.Write("\r\n\r\n");
             
-            #line 39 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
+            #line 39 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
  } 
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.tt
index 838b80c..327a996 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.tt
@@ -21,20 +21,20 @@ namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name
         /// <summary>
         /// <#= p.Remarks #>
         /// </summary>
-<# if(p.Nullable){ #>
+<# if(p.Nullable && p.Type == PropertyType.String){ #>
 		[Nullable]
 <# } #>
 <# if(p.Type == PropertyType.String){ #>
 <# if(p.Length == 0){ #>
 		[Max]
-<# } else { #>
+<# } else if(p.Length !=50) { #>
         [Length(<#= p.Length #>)]
 <# } #>
 <# } #>
 <# if(p.Type == PropertyType.Decimal||p.Type == PropertyType.Double){ #>
 		[Precision]
 <# } #>
-        public <#= p.Type == PropertyType.Enum ? p.Enum.Name : p.Type.ToDescription() #> <#= p.Name #> { get; set; }<#= GetDefaultValue(p) #>
+        public <#= p.Type == PropertyType.Enum ? p.Enum.Name : p.Type.ToDescription() #> <#= p.Name #><#= p.Nullable && p.Type != PropertyType.String ? "?" : "" #> { get; set; }<#= GetDefaultValue(p) #>
 
 <# } #>
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.cs
index 5d1f03f..f4a1e76 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.cs
@@ -40,7 +40,8 @@ public virtual string TransformText()
   },
   globals: {
     $http: 'readonly',
-    $api: 'readonly'
+    $api: 'readonly',
+    $const: 'readonly'
   }
 }
 ");
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.tt
index fdb479a..4ab8d9c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Eslintrc.tt
@@ -13,6 +13,7 @@ module.exports = {
   },
   globals: {
     $http: 'readonly',
-    $api: 'readonly'
+    $api: 'readonly',
+    $const: 'readonly'
   }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs
index 00bd753..956ccdf 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.Extend.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using NetModular.Module.CodeGenerator.Infrastructure.NuGet;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Web
@@ -7,11 +8,13 @@ public partial class Csproj : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
         private readonly string _prefix;
+        private readonly NuGetPackageVersions _versions;
 
         public Csproj(TemplateBuildModel model)
         {
             _model = model;
             _prefix = model.Module.Prefix;
+            _versions = _model.NuGetPackageVersions;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
index fa20630..93c5c31 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
@@ -35,28 +35,56 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Auth.Web\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Auth.Web\" Version=\"");
+            
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Auth_Web));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
             
             #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Module.AspNetCore\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Module.AspNetCore\" Version=\"");
+            
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Module_AspNetCore));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
             
             #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Utils.Mvc\" Version=\"1.7.1\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Utils.Mvc\" Version=\"");
+            
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Utils_Mvc));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
             
             #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(@".Lib.Validation.FluentValidation"" Version=""1.7.0"" />
+            this.Write(".Lib.Validation.FluentValidation\" Version=\"");
+            
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Validation_FluentValidation));
+            
+            #line default
+            #line hidden
+            this.Write(@""" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
index 51ea946..f5a0370 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="<#= _prefix #>.Lib.Auth.Web" Version="1.7.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Module.AspNetCore" Version="1.7.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Utils.Mvc" Version="1.7.1" />
-    <PackageReference Include="<#= _prefix #>.Lib.Validation.FluentValidation" Version="1.7.0" />
+	<PackageReference Include="<#= _prefix #>.Lib.Auth.Web" Version="<#= _versions.Lib_Auth_Web #>" />
+    <PackageReference Include="<#= _prefix #>.Lib.Module.AspNetCore" Version="<#= _versions.Lib_Module_AspNetCore #>" />
+    <PackageReference Include="<#= _prefix #>.Lib.Utils.Mvc" Version="<#= _versions.Lib_Utils_Mvc #>" />
+    <PackageReference Include="<#= _prefix #>.Lib.Validation.FluentValidation" Version="<#= _versions.Lib_Validation_FluentValidation #>" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs
index 2c38241..f6dc09f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.Extend.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using NetModular.Module.CodeGenerator.Infrastructure.NuGet;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost
@@ -7,11 +8,13 @@ public partial class Csproj : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
         private readonly string _prefix;
+        private readonly NuGetPackageVersions _versions;
 
         public Csproj(TemplateBuildModel model)
         {
             _model = model;
             _prefix = model.Module.Prefix;
+            _versions = _model.NuGetPackageVersions;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
index 506f056..7470931 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
@@ -43,49 +43,98 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Cache.MemoryCache\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Cache.MemoryCache\" Version=\"");
+            
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Cache_MemoryCache));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
             
             #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.MySql\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.MySql\" Version=\"");
+            
+            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Data_MySql));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
             
             #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.SQLite\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.SQLite\" Version=\"");
+            
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Data_SQLite));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
             
             #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.SqlServer\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Data.SqlServer\" Version=\"");
+            
+            #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Data_SqlServer));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
             
             #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Excel.EPPlus\" Version=\"1.7.0\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Excel.EPPlus\" Version=\"");
+            
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Excel_EPPlus));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
             
             #line 18 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Host.Web\" Version=\"1.7.1\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Host.Web\" Version=\"");
+            
+            #line 18 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Host_Web));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
             
             #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(@".Module.Admin.Web"" Version=""1.7.1"" />
+            this.Write(".Module.Admin.Web\" Version=\"");
+            
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Module_Admin_Web));
+            
+            #line default
+            #line hidden
+            this.Write(@""" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
index 1cd5af2..dd206fa 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
@@ -10,13 +10,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="<#= _prefix #>.Lib.Cache.MemoryCache" Version="1.7.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.MySql" Version="1.7.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.SQLite" Version="1.7.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Data.SqlServer" Version="1.7.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Excel.EPPlus" Version="1.7.0" />
-    <PackageReference Include="<#= _prefix #>.Lib.Host.Web" Version="1.7.1" />
-    <PackageReference Include="<#= _prefix #>.Module.Admin.Web" Version="1.7.1" />
+	<PackageReference Include="<#= _prefix #>.Lib.Cache.MemoryCache" Version="<#= _versions.Lib_Cache_MemoryCache #>" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.MySql" Version="<#= _versions.Lib_Data_MySql #>" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.SQLite" Version="<#= _versions.Lib_Data_SQLite #>" />
+    <PackageReference Include="<#= _prefix #>.Lib.Data.SqlServer" Version="<#= _versions.Lib_Data_SqlServer #>" />
+    <PackageReference Include="<#= _prefix #>.Lib.Excel.EPPlus" Version="<#= _versions.Lib_Excel_EPPlus #>" />
+    <PackageReference Include="<#= _prefix #>.Lib.Host.Web" Version="<#= _versions.Lib_Host_Web #>" />
+    <PackageReference Include="<#= _prefix #>.Module.Admin.Web" Version="<#= _versions.Module_Admin_Web #>" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Models/ModuleBuildModel.cs b/src/Library/Infrastructure/Templates/Models/ModuleBuildModel.cs
index d678f4d..446a53f 100644
--- a/src/Library/Infrastructure/Templates/Models/ModuleBuildModel.cs
+++ b/src/Library/Infrastructure/Templates/Models/ModuleBuildModel.cs
@@ -42,6 +42,21 @@ public class ModuleBuildModel
         /// </summary>
         public string Copyright { get; set; }
 
+        /// <summary>
+        /// 公司单位
+        /// </summary>
+        public string Company { get; set; }
+
+        /// <summary>
+        /// 官方地址
+        /// </summary>
+        public string ProjectUrl { get; set; }
+
+        /// <summary>
+        /// 仓库地址
+        /// </summary>
+        public string RepositoryUrl { get; set; }
+
         /// <summary>
         /// 类列表
         /// </summary>
diff --git a/src/Library/Infrastructure/Templates/Models/TemplateBuildModel.cs b/src/Library/Infrastructure/Templates/Models/TemplateBuildModel.cs
index f2a7662..8930cb8 100644
--- a/src/Library/Infrastructure/Templates/Models/TemplateBuildModel.cs
+++ b/src/Library/Infrastructure/Templates/Models/TemplateBuildModel.cs
@@ -1,4 +1,6 @@
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Models
+using NetModular.Module.CodeGenerator.Infrastructure.NuGet;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Models
 {
     /// <summary>
     /// 模板生成模型
@@ -19,5 +21,10 @@ public class TemplateBuildModel
         /// 模块模型
         /// </summary>
         public ModuleBuildModel Module { get; set; }
+
+        /// <summary>
+        /// NuGet包版本
+        /// </summary>
+        public NuGetPackageVersions NuGetPackageVersions { get; set; }
     }
 }
diff --git a/src/UI/module-code-generator/src/views/property/components/edit/index.vue b/src/UI/module-code-generator/src/views/property/components/edit/index.vue
deleted file mode 100644
index 13883bc..0000000
--- a/src/UI/module-code-generator/src/views/property/components/edit/index.vue
+++ /dev/null
@@ -1,202 +0,0 @@
-<template>
-  <nm-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
-    <el-row>
-      <el-col :span="20" :offset="1">
-        <el-form-item label="所属类：">
-          <el-input v-model="parent.name" disabled />
-        </el-form-item>
-        <el-form-item label="名称：" prop="name">
-          <el-input v-model="form.model.name" />
-        </el-form-item>
-        <el-form-item label="类型：" prop="type">
-          <type-select v-model="form.model.type" />
-        </el-form-item>
-        <el-form-item v-show="showLength" label="长度：" prop="length">
-          <el-input v-model.number="form.model.length" />
-        </el-form-item>
-        <el-form-item v-show="showPrecision" label="精度：" prop="precision">
-          <el-input v-model.number="form.model.precision" />
-        </el-form-item>
-        <el-form-item v-show="showScale" label="刻度：" prop="scale">
-          <el-input v-model.number="form.model.scale" />
-        </el-form-item>
-        <el-form-item v-show="showEnum" label="枚举：" prop="enumId">
-          <enum-select v-model="form.model.enumId" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="6" :offset="1">
-        <el-form-item label="可空：" prop="nullable">
-          <el-switch v-model="form.model.nullable" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="7">
-        <el-form-item label="列表显示：" prop="showInList">
-          <el-switch v-model="form.model.showInList" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="包含默认值：" prop="hasDefaultValue">
-          <el-switch v-model="form.model.hasDefaultValue" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="20" :offset="1">
-        <el-form-item label="备注：" prop="remarks">
-          <el-input v-model="form.model.remarks" />
-        </el-form-item>
-        <el-form-item label="序号：" prop="sort">
-          <el-input type="number" v-model.number="form.model.sort" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </nm-form-dialog>
-</template>
-<script>
-import { mixins } from 'netmodular-ui'
-import TypeSelect from '../type-select'
-import EnumSelect from '../../../enum/components/select'
-
-const api = $api.codeGenerator.property
-const enumApi = $api.codeGenerator.enum
-
-export default {
-  mixins: [mixins.formDialogEdit],
-  components: { TypeSelect, EnumSelect },
-  data() {
-    // 验证字符串长度
-    const validateLength = (rule, value, callback) => {
-      if (this.showLength) {
-        if (value === '') {
-          callback(new Error('请输入长度'))
-        } else if (!Number.isInteger(value)) {
-          callback(new Error('请输入正确的长度'))
-        } else if (value < 0) {
-          callback(new Error('长度不能小于0'))
-        } else {
-          callback()
-        }
-      } else {
-        callback()
-      }
-    }
-    // 验证精度
-    const validatePrecision = (rule, value, callback) => {
-      if (this.showPrecision) {
-        if (value === '') {
-          callback(new Error('请输入精度'))
-        } else if (!Number.isInteger(value)) {
-          callback(new Error('请输入正确的精度'))
-        } else if (value < 1) {
-          callback(new Error('精度不能小于1'))
-        } else {
-          callback()
-        }
-      } else {
-        callback()
-      }
-    }
-    // 验证刻度
-    const validateScale = (rule, value, callback) => {
-      if (this.showPrecision) {
-        if (value === '') {
-          callback(new Error('请输入刻度'))
-        } else if (!Number.isInteger(value)) {
-          callback(new Error('请输入正确的刻度'))
-        } else if (value < 0) {
-          callback(new Error('刻度不能小于0'))
-        } else if (value > this.form.model.precision) {
-          callback(new Error('刻度不能大于精度'))
-        } else {
-          callback()
-        }
-      } else {
-        callback()
-      }
-    }
-    // 验证枚举
-    const validateEnum = (rule, value, callback) => {
-      if (this.showEnum && value === '') {
-        callback(new Error('请选择枚举'))
-      } else {
-        callback()
-      }
-    }
-    return {
-      api,
-      form: {
-        title: '编辑属性',
-        width: '40%',
-        action: api.update,
-        model: {
-          name: '',
-          type: 0,
-          length: 0,
-          precision: 0,
-          scale: 0,
-          enumId: '',
-          nullable: false,
-          remarks: '',
-          sort: 0,
-          showInList: true,
-          hasDefaultValue: false
-        },
-        rules: {
-          classId: [{ required: true, message: '请选择类', trigger: 'blur' }],
-          name: [{ required: true, message: '请输入类名', trigger: 'blur' }],
-          type: [
-            { required: true, message: '请选择类型', trigger: 'blur' },
-            { type: 'number', message: '请选择正确的类型', trigger: 'blur' }
-          ],
-          length: [{ validator: validateLength }],
-          precision: [{ validator: validatePrecision }],
-          scale: [{ validator: validateScale }],
-          enumId: [{ validator: validateEnum }],
-          remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }]
-        }
-      }
-    }
-  },
-  props: {
-    parent: {
-      type: Object,
-      required: true
-    }
-  },
-  computed: {
-    showLength() {
-      return this.form.model.type === 0
-    },
-    showPrecision() {
-      return this.form.model.type === 5 || this.form.model.type === 6
-    },
-    showScale() {
-      return this.form.model.type === 6
-    },
-    showEnum() {
-      return this.form.model.type === 10
-    }
-  },
-  methods: {
-    getEnumSelect() {
-      return enumApi.select()
-    }
-  },
-  watch: {
-    'form.model.type'() {
-      if (!this.showLength) {
-        this.form.model.length = 0
-      }
-      if (!this.showPrecision) {
-        this.form.model.precision = 0
-        this.form.model.scale = 0
-      }
-      if (!this.showEnum) {
-        this.form.model.enumId = ''
-      }
-    }
-  }
-}
-</script>
diff --git a/src/UI/module-code-generator/.browserslistrc b/src/UI/module-codegenerator/.browserslistrc
similarity index 100%
rename from src/UI/module-code-generator/.browserslistrc
rename to src/UI/module-codegenerator/.browserslistrc
diff --git a/src/UI/module-code-generator/.eslintrc.js b/src/UI/module-codegenerator/.eslintrc.js
similarity index 87%
rename from src/UI/module-code-generator/.eslintrc.js
rename to src/UI/module-codegenerator/.eslintrc.js
index fdb479a..4ab8d9c 100644
--- a/src/UI/module-code-generator/.eslintrc.js
+++ b/src/UI/module-codegenerator/.eslintrc.js
@@ -13,6 +13,7 @@ module.exports = {
   },
   globals: {
     $http: 'readonly',
-    $api: 'readonly'
+    $api: 'readonly',
+    $const: 'readonly'
   }
 }
diff --git a/src/UI/module-code-generator/.prettierrc b/src/UI/module-codegenerator/.prettierrc
similarity index 100%
rename from src/UI/module-code-generator/.prettierrc
rename to src/UI/module-codegenerator/.prettierrc
diff --git a/src/UI/module-code-generator/.vscode/settings.json b/src/UI/module-codegenerator/.vscode/settings.json
similarity index 100%
rename from src/UI/module-code-generator/.vscode/settings.json
rename to src/UI/module-codegenerator/.vscode/settings.json
diff --git a/src/UI/module-code-generator/babel.config.js b/src/UI/module-codegenerator/babel.config.js
similarity index 100%
rename from src/UI/module-code-generator/babel.config.js
rename to src/UI/module-codegenerator/babel.config.js
diff --git a/src/UI/module-codegenerator/package-lock.json b/src/UI/module-codegenerator/package-lock.json
new file mode 100644
index 0000000..3c17e3a
--- /dev/null
+++ b/src/UI/module-codegenerator/package-lock.json
@@ -0,0 +1,12129 @@
+{
+  "name": "netmodular-module-code-generator",
+  "version": "1.1.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.5.5.tgz",
+      "integrity": "sha1-vAeC9tafe31JUxIZaZuYj2aaj50=",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.0.0"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.6.tgz",
+      "integrity": "sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.8.5",
+        "invariant": "^2.2.4",
+        "semver": "^5.5.0"
+      }
+    },
+    "@babel/core": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.6.tgz",
+      "integrity": "sha512-Sheg7yEJD51YHAvLEV/7Uvw95AeWqYPL3Vk3zGujJKIhJ+8oLw2ALaf3hbucILhKsgSoADOvtKRJuNVdcJkOrg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.8.6",
+        "@babel/helpers": "^7.8.4",
+        "@babel/parser": "^7.8.6",
+        "@babel/template": "^7.8.6",
+        "@babel/traverse": "^7.8.6",
+        "@babel/types": "^7.8.6",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.1",
+        "json5": "^2.1.0",
+        "lodash": "^4.17.13",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
+          "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.0.0",
+            "esutils": "^2.0.2",
+            "js-tokens": "^4.0.0"
+          }
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.6.tgz",
+      "integrity": "sha512-4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.8.6",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
+      }
+    },
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz",
+      "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz",
+      "integrity": "sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.8.3",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-call-delegate": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz",
+      "integrity": "sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.6.tgz",
+      "integrity": "sha512-UrJdk27hKVJSnibFcUWYLkCL0ZywTUoot8yii1lsHJcvwrypagmYKjHLMWivQPm4s6GdyygCL8fiH5EYLxhQwQ==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.8.6",
+        "browserslist": "^4.8.5",
+        "invariant": "^2.2.4",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
+      }
+    },
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz",
+      "integrity": "sha512-klTBDdsr+VFFqaDHm5rR69OpEQtO2Qv8ECxHS1mNhJJvaHArR6a1xTf5K/eZW7eZpJbhCx3NW1Yt/sKsLXLblg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/helper-member-expression-to-functions": "^7.8.3",
+        "@babel/helper-optimise-call-expression": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-replace-supers": "^7.8.6",
+        "@babel/helper-split-export-declaration": "^7.8.3"
+      }
+    },
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.6.tgz",
+      "integrity": "sha512-bPyujWfsHhV/ztUkwGHz/RPV1T1TDEsSZDsN42JPehndA+p1KKTh3npvTadux0ZhCrytx9tvjpWNowKby3tM6A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-regex": "^7.8.3",
+        "regexpu-core": "^4.6.0"
+      }
+    },
+    "@babel/helper-define-map": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz",
+      "integrity": "sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/types": "^7.8.3",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz",
+      "integrity": "sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==",
+      "dev": true,
+      "requires": {
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz",
+      "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
+      "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz",
+      "integrity": "sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
+      "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
+      "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz",
+      "integrity": "sha512-RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-replace-supers": "^7.8.6",
+        "@babel/helper-simple-access": "^7.8.3",
+        "@babel/helper-split-export-declaration": "^7.8.3",
+        "@babel/template": "^7.8.6",
+        "@babel/types": "^7.8.6",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
+      "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+      "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+      "dev": true
+    },
+    "@babel/helper-regex": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz",
+      "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz",
+      "integrity": "sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-wrap-function": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
+      "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.8.3",
+        "@babel/helper-optimise-call-expression": "^7.8.3",
+        "@babel/traverse": "^7.8.6",
+        "@babel/types": "^7.8.6"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz",
+      "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.8.3",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
+      "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-wrap-function": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz",
+      "integrity": "sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helpers": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz",
+      "integrity": "sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.8.4",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npm.taobao.org/@babel/highlight/download/@babel/highlight-7.5.0.tgz",
+      "integrity": "sha1-VtETEr2SSPphlZHQJHK+boyzJUA=",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/parser": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.6.tgz",
+      "integrity": "sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g==",
+      "dev": true
+    },
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz",
+      "integrity": "sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-remap-async-to-generator": "^7.8.3",
+        "@babel/plugin-syntax-async-generators": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz",
+      "integrity": "sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-decorators": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz",
+      "integrity": "sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-decorators": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz",
+      "integrity": "sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz",
+      "integrity": "sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-decorators": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz",
+      "integrity": "sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-jsx": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz",
+      "integrity": "sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz",
+      "integrity": "sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz",
+      "integrity": "sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz",
+      "integrity": "sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-remap-async-to-generator": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz",
+      "integrity": "sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz",
+      "integrity": "sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "lodash": "^4.17.13"
+      }
+    },
+    "@babel/plugin-transform-classes": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz",
+      "integrity": "sha512-k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-define-map": "^7.8.3",
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/helper-optimise-call-expression": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-replace-supers": "^7.8.6",
+        "@babel/helper-split-export-declaration": "^7.8.3",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz",
+      "integrity": "sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz",
+      "integrity": "sha512-H4X646nCkiEcHZUZaRkhE2XVsoz0J/1x3VVujnn96pSoGCtKPA99ZZA+va+gK+92Zycd6OBKCD8tDb/731bhgQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz",
+      "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz",
+      "integrity": "sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz",
+      "integrity": "sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-for-of": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz",
+      "integrity": "sha512-M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-function-name": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz",
+      "integrity": "sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-literals": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz",
+      "integrity": "sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz",
+      "integrity": "sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz",
+      "integrity": "sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
+      }
+    },
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz",
+      "integrity": "sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-simple-access": "^7.8.3",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
+      }
+    },
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz",
+      "integrity": "sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.8.3",
+        "@babel/helper-module-transforms": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
+      }
+    },
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz",
+      "integrity": "sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz",
+      "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-new-target": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz",
+      "integrity": "sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-object-super": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz",
+      "integrity": "sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-replace-supers": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-parameters": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz",
+      "integrity": "sha512-IsS3oTxeTsZlE5KqzTbcC2sV0P9pXdec53SU+Yxv7o/6dvGM5AkTotQKhoSffhNgZ/dftsSiOoxy7evCYJXzVA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-call-delegate": "^7.8.3",
+        "@babel/helper-get-function-arity": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz",
+      "integrity": "sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz",
+      "integrity": "sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA==",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.14.0"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz",
+      "integrity": "sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-runtime": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz",
+      "integrity": "sha512-/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "resolve": "^1.8.1",
+        "semver": "^5.5.1"
+      }
+    },
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz",
+      "integrity": "sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz",
+      "integrity": "sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz",
+      "integrity": "sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-regex": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz",
+      "integrity": "sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz",
+      "integrity": "sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz",
+      "integrity": "sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/polyfill": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.8.3.tgz",
+      "integrity": "sha512-0QEgn2zkCzqGIkSWWAEmvxD7e00Nm9asTtQvi7HdlYvMhjy/J38V/1Y9ode0zEJeIuxAI0uftiAzqc7nVeWUGg==",
+      "requires": {
+        "core-js": "^2.6.5",
+        "regenerator-runtime": "^0.13.2"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.11",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
+        }
+      }
+    },
+    "@babel/preset-env": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.6.tgz",
+      "integrity": "sha512-M5u8llV9DIVXBFB/ArIpqJuvXpO+ymxcJ6e8ZAmzeK3sQeBNOD1y+rHvHCGG4TlEmsNpIrdecsHGHT8ZCoOSJg==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.8.6",
+        "@babel/helper-compilation-targets": "^7.8.6",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
+        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
+        "@babel/plugin-proposal-json-strings": "^7.8.3",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-proposal-object-rest-spread": "^7.8.3",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-proposal-optional-chaining": "^7.8.3",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
+        "@babel/plugin-syntax-async-generators": "^7.8.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+        "@babel/plugin-syntax-json-strings": "^7.8.0",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3",
+        "@babel/plugin-transform-arrow-functions": "^7.8.3",
+        "@babel/plugin-transform-async-to-generator": "^7.8.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
+        "@babel/plugin-transform-block-scoping": "^7.8.3",
+        "@babel/plugin-transform-classes": "^7.8.6",
+        "@babel/plugin-transform-computed-properties": "^7.8.3",
+        "@babel/plugin-transform-destructuring": "^7.8.3",
+        "@babel/plugin-transform-dotall-regex": "^7.8.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.8.3",
+        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
+        "@babel/plugin-transform-for-of": "^7.8.6",
+        "@babel/plugin-transform-function-name": "^7.8.3",
+        "@babel/plugin-transform-literals": "^7.8.3",
+        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
+        "@babel/plugin-transform-modules-amd": "^7.8.3",
+        "@babel/plugin-transform-modules-commonjs": "^7.8.3",
+        "@babel/plugin-transform-modules-systemjs": "^7.8.3",
+        "@babel/plugin-transform-modules-umd": "^7.8.3",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
+        "@babel/plugin-transform-new-target": "^7.8.3",
+        "@babel/plugin-transform-object-super": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.8.4",
+        "@babel/plugin-transform-property-literals": "^7.8.3",
+        "@babel/plugin-transform-regenerator": "^7.8.3",
+        "@babel/plugin-transform-reserved-words": "^7.8.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.8.3",
+        "@babel/plugin-transform-spread": "^7.8.3",
+        "@babel/plugin-transform-sticky-regex": "^7.8.3",
+        "@babel/plugin-transform-template-literals": "^7.8.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.8.4",
+        "@babel/plugin-transform-unicode-regex": "^7.8.3",
+        "@babel/types": "^7.8.6",
+        "browserslist": "^4.8.5",
+        "core-js-compat": "^3.6.2",
+        "invariant": "^2.2.2",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz",
+      "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==",
+      "dev": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.2"
+      }
+    },
+    "@babel/template": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/parser": "^7.8.6",
+        "@babel/types": "^7.8.6"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
+          "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.0.0",
+            "esutils": "^2.0.2",
+            "js-tokens": "^4.0.0"
+          }
+        }
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz",
+      "integrity": "sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.8.6",
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/helper-split-export-declaration": "^7.8.3",
+        "@babel/parser": "^7.8.6",
+        "@babel/types": "^7.8.6",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.13"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
+          "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.0.0",
+            "esutils": "^2.0.2",
+            "js-tokens": "^4.0.0"
+          }
+        }
+      }
+    },
+    "@babel/types": {
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz",
+      "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.13",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@hapi/address": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
+      "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==",
+      "dev": true
+    },
+    "@hapi/bourne": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz",
+      "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==",
+      "dev": true
+    },
+    "@hapi/hoek": {
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
+      "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==",
+      "dev": true
+    },
+    "@hapi/joi": {
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz",
+      "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
+      "dev": true,
+      "requires": {
+        "@hapi/address": "2.x.x",
+        "@hapi/bourne": "1.x.x",
+        "@hapi/hoek": "8.x.x",
+        "@hapi/topo": "3.x.x"
+      }
+    },
+    "@hapi/topo": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz",
+      "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==",
+      "dev": true,
+      "requires": {
+        "@hapi/hoek": "^8.3.0"
+      }
+    },
+    "@intervolga/optimize-cssnano-plugin": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz",
+      "integrity": "sha512-zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA==",
+      "dev": true,
+      "requires": {
+        "cssnano": "^4.0.0",
+        "cssnano-preset-default": "^4.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "@mrmlnc/readdir-enhanced": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+      "dev": true,
+      "requires": {
+        "call-me-maybe": "^1.0.1",
+        "glob-to-regexp": "^0.3.0"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+      "dev": true
+    },
+    "@soda/friendly-errors-webpack-plugin": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz",
+      "integrity": "sha512-cWKrGaFX+rfbMrAxVv56DzhPNqOJPZuNIS2HGMELtgGzb+vsMzyig9mml5gZ/hr2BGtSLV+dP2LUEuAL8aG2mQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "error-stack-parser": "^2.0.0",
+        "string-width": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+      "dev": true
+    },
+    "@types/events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
+      "dev": true
+    },
+    "@types/glob": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+      "dev": true,
+      "requires": {
+        "@types/events": "*",
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "13.7.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.7.tgz",
+      "integrity": "sha512-Uo4chgKbnPNlxQwoFmYIwctkQVkMMmsAoGGU4JKwLuvBefF0pCq4FybNSnfkfRCpC7ZW7kttcC/TrRtAJsvGtg==",
+      "dev": true
+    },
+    "@types/normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "dev": true
+    },
+    "@types/q": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
+      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
+      "dev": true
+    },
+    "@vue/babel-helper-vue-jsx-merge-props": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
+      "integrity": "sha512-6tyf5Cqm4m6v7buITuwS+jHzPlIPxbFzEhXR5JGZpbrvOcp1hiQKckd305/3C7C36wFekNTQSxAtgeM0j0yoUw==",
+      "dev": true
+    },
+    "@vue/babel-plugin-transform-vue-jsx": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.1.2.tgz",
+      "integrity": "sha512-YfdaoSMvD1nj7+DsrwfTvTnhDXI7bsuh+Y5qWwvQXlD24uLgnsoww3qbiZvWf/EoviZMrvqkqN4CBw0W3BWUTQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/plugin-syntax-jsx": "^7.2.0",
+        "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
+        "html-tags": "^2.0.0",
+        "lodash.kebabcase": "^4.1.1",
+        "svg-tags": "^1.0.0"
+      }
+    },
+    "@vue/babel-preset-app": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.2.3.tgz",
+      "integrity": "sha512-Xlc8d9Ebgu9pNZMUxKZWVP2CctVZzfX3LAxjBDWAAIiVpdXX4IkQQCevDhgiANFzlmE3KXtiSgPGs57Sso2g7Q==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.8.4",
+        "@babel/helper-compilation-targets": "^7.8.4",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/plugin-proposal-class-properties": "^7.8.3",
+        "@babel/plugin-proposal-decorators": "^7.8.3",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-jsx": "^7.8.3",
+        "@babel/plugin-transform-runtime": "^7.8.3",
+        "@babel/preset-env": "^7.8.4",
+        "@babel/runtime": "^7.8.4",
+        "@vue/babel-preset-jsx": "^1.1.2",
+        "babel-plugin-dynamic-import-node": "^2.3.0",
+        "core-js": "^3.6.4",
+        "core-js-compat": "^3.6.4"
+      }
+    },
+    "@vue/babel-preset-jsx": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.2.tgz",
+      "integrity": "sha512-zDpVnFpeC9YXmvGIDSsKNdL7qCG2rA3gjywLYHPCKDT10erjxF4U+6ay9X6TW5fl4GsDlJp9bVfAVQAAVzxxvQ==",
+      "dev": true,
+      "requires": {
+        "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
+        "@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
+        "@vue/babel-sugar-functional-vue": "^1.1.2",
+        "@vue/babel-sugar-inject-h": "^1.1.2",
+        "@vue/babel-sugar-v-model": "^1.1.2",
+        "@vue/babel-sugar-v-on": "^1.1.2"
+      }
+    },
+    "@vue/babel-sugar-functional-vue": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.1.2.tgz",
+      "integrity": "sha512-YhmdJQSVEFF5ETJXzrMpj0nkCXEa39TvVxJTuVjzvP2rgKhdMmQzlJuMv/HpadhZaRVMCCF3AEjjJcK5q/cYzQ==",
+      "dev": true,
+      "requires": {
+        "@babel/plugin-syntax-jsx": "^7.2.0"
+      }
+    },
+    "@vue/babel-sugar-inject-h": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.1.2.tgz",
+      "integrity": "sha512-VRSENdTvD5htpnVp7i7DNuChR5rVMcORdXjvv5HVvpdKHzDZAYiLSD+GhnhxLm3/dMuk8pSzV+k28ECkiN5m8w==",
+      "dev": true,
+      "requires": {
+        "@babel/plugin-syntax-jsx": "^7.2.0"
+      }
+    },
+    "@vue/babel-sugar-v-model": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.1.2.tgz",
+      "integrity": "sha512-vLXPvNq8vDtt0u9LqFdpGM9W9IWDmCmCyJXuozlq4F4UYVleXJ2Fa+3JsnTZNJcG+pLjjfnEGHci2339Kj5sGg==",
+      "dev": true,
+      "requires": {
+        "@babel/plugin-syntax-jsx": "^7.2.0",
+        "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
+        "@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
+        "camelcase": "^5.0.0",
+        "html-tags": "^2.0.0",
+        "svg-tags": "^1.0.0"
+      }
+    },
+    "@vue/babel-sugar-v-on": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.1.2.tgz",
+      "integrity": "sha512-T8ZCwC8Jp2uRtcZ88YwZtZXe7eQrJcfRq0uTFy6ShbwYJyz5qWskRFoVsdTi9o0WEhmQXxhQUewodOSCUPVmsQ==",
+      "dev": true,
+      "requires": {
+        "@babel/plugin-syntax-jsx": "^7.2.0",
+        "@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
+        "camelcase": "^5.0.0"
+      }
+    },
+    "@vue/cli-overlay": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.2.3.tgz",
+      "integrity": "sha512-V51eS7NIsK/rv19oK0+B5Yl/VNWCJTTkjibreIXDknOLSH3MKTOJamUI1BEYo5FOXBWw+7DLmaNF3XKemQ5Y/w==",
+      "dev": true
+    },
+    "@vue/cli-plugin-babel": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-4.2.3.tgz",
+      "integrity": "sha512-vbK6f7dN4gj+6xyhTZkvjjbz1vsTwX+ObRD0ElaaipXo2oVSBAAPPGHkLjnH8C2brDLPeLHdUCzERzx2kc2lmQ==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.8.4",
+        "@vue/babel-preset-app": "^4.2.3",
+        "@vue/cli-shared-utils": "^4.2.3",
+        "babel-loader": "^8.0.6",
+        "cache-loader": "^4.1.0",
+        "thread-loader": "^2.1.3",
+        "webpack": "^4.0.0"
+      }
+    },
+    "@vue/cli-plugin-eslint": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.2.3.tgz",
+      "integrity": "sha512-r3J0OAa8x0tZZYFxxFZ/C5WWxYGGH8hLfUUhs3FePo0VsBci28lrgvnBqr69uj/T40v/ndBh0geAz28mjjQ+mg==",
+      "dev": true,
+      "requires": {
+        "@vue/cli-shared-utils": "^4.2.3",
+        "eslint-loader": "^2.1.2",
+        "globby": "^9.2.0",
+        "inquirer": "^6.3.1",
+        "webpack": "^4.0.0",
+        "yorkie": "^2.0.0"
+      }
+    },
+    "@vue/cli-plugin-router": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.2.3.tgz",
+      "integrity": "sha512-RGtgFQCTMS1X1wtFt752RMgr/LlF9cfpH37MkwjhF2wpnyTp+hkKl/09QORAKW91I8iFpZFH7xZKMBS3r1WbCw==",
+      "dev": true,
+      "requires": {
+        "@vue/cli-shared-utils": "^4.2.3"
+      }
+    },
+    "@vue/cli-plugin-vuex": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.2.3.tgz",
+      "integrity": "sha512-7M4CaoAD4W/GdiDI4+Gh2tATPFBnb/u7bCiLLDsuL9ztypv7l3p4cu43zkDpTCCuufkZFYtZwysOAY8SbGqOjg==",
+      "dev": true
+    },
+    "@vue/cli-service": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.2.3.tgz",
+      "integrity": "sha512-eSsmrt7nIZInmEvVW5x7eQLdEywBin79nKduB2PgYx0Me82wRfKDa8JpkCM6jZV0AxIuaF7N4RkPOtlkrBKX9Q==",
+      "dev": true,
+      "requires": {
+        "@intervolga/optimize-cssnano-plugin": "^1.0.5",
+        "@soda/friendly-errors-webpack-plugin": "^1.7.1",
+        "@vue/cli-overlay": "^4.2.3",
+        "@vue/cli-plugin-router": "^4.2.3",
+        "@vue/cli-plugin-vuex": "^4.2.3",
+        "@vue/cli-shared-utils": "^4.2.3",
+        "@vue/component-compiler-utils": "^3.0.2",
+        "@vue/preload-webpack-plugin": "^1.1.0",
+        "@vue/web-component-wrapper": "^1.2.0",
+        "acorn": "^7.1.0",
+        "acorn-walk": "^7.0.0",
+        "address": "^1.1.2",
+        "autoprefixer": "^9.7.4",
+        "browserslist": "^4.8.6",
+        "cache-loader": "^4.1.0",
+        "case-sensitive-paths-webpack-plugin": "^2.3.0",
+        "cli-highlight": "^2.1.4",
+        "clipboardy": "^2.1.0",
+        "cliui": "^6.0.0",
+        "copy-webpack-plugin": "^5.1.1",
+        "css-loader": "^3.4.2",
+        "cssnano": "^4.1.10",
+        "current-script-polyfill": "^1.0.0",
+        "debug": "^4.1.1",
+        "default-gateway": "^5.0.5",
+        "dotenv": "^8.2.0",
+        "dotenv-expand": "^5.1.0",
+        "file-loader": "^4.2.0",
+        "fs-extra": "^7.0.1",
+        "globby": "^9.2.0",
+        "hash-sum": "^2.0.0",
+        "html-webpack-plugin": "^3.2.0",
+        "launch-editor-middleware": "^2.2.1",
+        "lodash.defaultsdeep": "^4.6.1",
+        "lodash.mapvalues": "^4.6.0",
+        "lodash.transform": "^4.6.0",
+        "mini-css-extract-plugin": "^0.9.0",
+        "minimist": "^1.2.0",
+        "pnp-webpack-plugin": "^1.6.0",
+        "portfinder": "^1.0.25",
+        "postcss-loader": "^3.0.0",
+        "ssri": "^7.1.0",
+        "terser-webpack-plugin": "^2.3.4",
+        "thread-loader": "^2.1.3",
+        "url-loader": "^2.2.0",
+        "vue-loader": "^15.8.3",
+        "vue-style-loader": "^4.1.2",
+        "webpack": "^4.0.0",
+        "webpack-bundle-analyzer": "^3.6.0",
+        "webpack-chain": "^6.3.1",
+        "webpack-dev-server": "^3.10.2",
+        "webpack-merge": "^4.2.2"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+          "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
+          "dev": true
+        },
+        "cacache": {
+          "version": "13.0.1",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
+          "integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==",
+          "dev": true,
+          "requires": {
+            "chownr": "^1.1.2",
+            "figgy-pudding": "^3.5.1",
+            "fs-minipass": "^2.0.0",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.2.2",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^5.1.1",
+            "minipass": "^3.0.0",
+            "minipass-collect": "^1.0.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.2",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "p-map": "^3.0.0",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.7.1",
+            "ssri": "^7.0.0",
+            "unique-filename": "^1.1.1"
+          }
+        },
+        "find-cache-dir": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.0.tgz",
+          "integrity": "sha512-PtXtQb7IrD8O+h6Cq1dbpJH5NzD8+9keN1zZ0YlpDzl1PwXEJEBj6u1Xa92t1Hwluoozd9TNKul5Hi2iqpsWwg==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^3.0.2",
+            "pkg-dir": "^4.1.0"
+          }
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "make-dir": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz",
+          "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "dev": true,
+          "requires": {
+            "find-up": "^4.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "schema-utils": {
+          "version": "2.6.4",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
+          "integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.10.2",
+            "ajv-keywords": "^3.4.1"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "ssri": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz",
+          "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "minipass": "^3.1.1"
+          }
+        },
+        "terser-webpack-plugin": {
+          "version": "2.3.5",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz",
+          "integrity": "sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w==",
+          "dev": true,
+          "requires": {
+            "cacache": "^13.0.1",
+            "find-cache-dir": "^3.2.0",
+            "jest-worker": "^25.1.0",
+            "p-limit": "^2.2.2",
+            "schema-utils": "^2.6.4",
+            "serialize-javascript": "^2.1.2",
+            "source-map": "^0.6.1",
+            "terser": "^4.4.3",
+            "webpack-sources": "^1.4.3"
+          }
+        }
+      }
+    },
+    "@vue/cli-shared-utils": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.2.3.tgz",
+      "integrity": "sha512-GCoTB6vMZsi9z/Bmn8/C9IlnUw8eeHONOGE+48TJkZyulftVFhlwVWjTFp5GuDAlwpTWarHchW9IoVu3pIIGfA==",
+      "dev": true,
+      "requires": {
+        "@hapi/joi": "^15.0.1",
+        "chalk": "^2.4.2",
+        "execa": "^1.0.0",
+        "launch-editor": "^2.2.1",
+        "lru-cache": "^5.1.1",
+        "node-ipc": "^9.1.1",
+        "open": "^6.3.0",
+        "ora": "^3.4.0",
+        "read-pkg": "^5.1.1",
+        "request": "^2.87.0",
+        "request-promise-native": "^1.0.8",
+        "semver": "^6.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "@vue/component-compiler-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.1.1.tgz",
+      "integrity": "sha512-+lN3nsfJJDGMNz7fCpcoYIORrXo0K3OTsdr8jCM7FuqdI4+70TY6gxY6viJ2Xi1clqyPg7LpeOWwjF31vSMmUw==",
+      "dev": true,
+      "requires": {
+        "consolidate": "^0.15.1",
+        "hash-sum": "^1.0.2",
+        "lru-cache": "^4.1.2",
+        "merge-source-map": "^1.1.0",
+        "postcss": "^7.0.14",
+        "postcss-selector-parser": "^6.0.2",
+        "prettier": "^1.18.2",
+        "source-map": "~0.6.1",
+        "vue-template-es2015-compiler": "^1.9.0"
+      },
+      "dependencies": {
+        "hash-sum": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+          "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "dev": true,
+          "requires": {
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+          "dev": true
+        }
+      }
+    },
+    "@vue/eslint-config-prettier": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npm.taobao.org/@vue/eslint-config-prettier/download/@vue/eslint-config-prettier-5.1.0.tgz",
+      "integrity": "sha1-g3JBom7TlpdsuNq9d5OTAyRVI88=",
+      "dev": true,
+      "requires": {
+        "eslint-config-prettier": "^6.0.0"
+      }
+    },
+    "@vue/preload-webpack-plugin": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.1.tgz",
+      "integrity": "sha512-8VCoJeeH8tCkzhkpfOkt+abALQkS11OIHhte5MBzYaKMTqK0A3ZAKEUVAffsOklhEv7t0yrQt696Opnu9oAx+w==",
+      "dev": true
+    },
+    "@vue/web-component-wrapper": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.2.0.tgz",
+      "integrity": "sha512-Xn/+vdm9CjuC9p3Ae+lTClNutrVhsXpzxvoTXXtoys6kVRX9FkueSUAqSWAyZntmVLlR4DosBV4pH8y5Z/HbUw==",
+      "dev": true
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "^0.0.3"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "dev": true,
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "dev": true,
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+      "dev": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/helper-wasm-section": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-opt": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-code-frame": "1.8.5",
+        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "dev": true,
+      "requires": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      }
+    },
+    "acorn": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-6.4.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-6.4.0.tgz",
+      "integrity": "sha1-tlnS/7r6JLr12xzbsslKmD7NJ4Q=",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npm.taobao.org/acorn-jsx/download/acorn-jsx-5.1.0.tgz?cache=0&sync_timestamp=1570991459312&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn-jsx%2Fdownload%2Facorn-jsx-5.1.0.tgz",
+      "integrity": "sha1-KUrbcbVzmLBoABXwo4xWPuHbU4Q=",
+      "dev": true
+    },
+    "acorn-walk": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz",
+      "integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==",
+      "dev": true
+    },
+    "address": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz",
+      "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==",
+      "dev": true
+    },
+    "aggregate-error": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz",
+      "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==",
+      "dev": true,
+      "requires": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      }
+    },
+    "ajv": {
+      "version": "6.10.2",
+      "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.10.2.tgz",
+      "integrity": "sha1-086gTWsBeyiUrWkED+yLYj60vVI=",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true
+    },
+    "ajv-keywords": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.4.1.tgz",
+      "integrity": "sha1-75FuJxxkrBIXH9g4TqrmsjRYVNo=",
+      "dev": true
+    },
+    "alphanum-sort": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
+      "dev": true
+    },
+    "ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npm.taobao.org/ansi-escapes/download/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha1-h4C5j/nb9WOBUtHx/lwde0RCl2s=",
+      "dev": true
+    },
+    "ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.1.0.tgz",
+      "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz?cache=0&sync_timestamp=1573557674483&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-3.2.1.tgz",
+      "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "requires": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "arch": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz",
+      "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npm.taobao.org/argparse/download/argparse-1.0.10.tgz",
+      "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+      "dev": true
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/astral-regex/download/astral-regex-1.0.0.tgz",
+      "integrity": "sha1-bIw/uCfdQ+45GPJ7gngqt2WKb9k=",
+      "dev": true
+    },
+    "async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true
+    },
+    "async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
+      "dev": true
+    },
+    "async-validator": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
+      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
+      "requires": {
+        "babel-runtime": "6.x"
+      }
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "autoprefixer": {
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.4.tgz",
+      "integrity": "sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.8.3",
+        "caniuse-lite": "^1.0.30001020",
+        "chalk": "^2.4.2",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.26",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
+      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
+      "dev": true
+    },
+    "axios": {
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
+      "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+      "requires": {
+        "follow-redirects": "1.5.10"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "follow-redirects": {
+          "version": "1.5.10",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+          "requires": {
+            "debug": "=3.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
+    "babel-eslint": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
+      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "resolve": "^1.12.0"
+      }
+    },
+    "babel-helper-vue-jsx-merge-props": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+      "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
+    },
+    "babel-loader": {
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
+      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
+      "dev": true,
+      "requires": {
+        "find-cache-dir": "^2.0.0",
+        "loader-utils": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "pify": "^4.0.1"
+      }
+    },
+    "babel-plugin-dynamic-import-node": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
+      "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
+      "dev": true,
+      "requires": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "requires": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.11",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
+        },
+        "regenerator-runtime": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+        }
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+      "dev": true
+    },
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "bfj": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
+      "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.5",
+        "check-types": "^8.0.3",
+        "hoopy": "^0.1.4",
+        "tryer": "^1.0.1"
+      }
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npm.taobao.org/big.js/download/big.js-5.2.2.tgz",
+      "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true
+    },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
+    },
+    "body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "dev": true
+        }
+      }
+    },
+    "bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "dev": true,
+      "requires": {
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "multicast-dns-service-types": "^1.1.0"
+      },
+      "dependencies": {
+        "array-flatten": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+          "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+          "dev": true
+        }
+      }
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz",
+      "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "browserslist": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz",
+      "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001030",
+        "electron-to-chromium": "^1.3.363",
+        "node-releases": "^1.1.50"
+      }
+    },
+    "buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
+      "dev": true
+    },
+    "buffer-json": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-json/-/buffer-json-2.0.0.tgz",
+      "integrity": "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "dev": true
+    },
+    "cacache": {
+      "version": "12.0.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
+      "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "cache-loader": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-4.1.0.tgz",
+      "integrity": "sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw==",
+      "dev": true,
+      "requires": {
+        "buffer-json": "^2.0.0",
+        "find-cache-dir": "^3.0.0",
+        "loader-utils": "^1.2.3",
+        "mkdirp": "^0.5.1",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "find-cache-dir": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.0.tgz",
+          "integrity": "sha512-PtXtQb7IrD8O+h6Cq1dbpJH5NzD8+9keN1zZ0YlpDzl1PwXEJEBj6u1Xa92t1Hwluoozd9TNKul5Hi2iqpsWwg==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^3.0.2",
+            "pkg-dir": "^4.1.0"
+          }
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "make-dir": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz",
+          "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+          "dev": true,
+          "requires": {
+            "find-up": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
+      "dev": true
+    },
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "dev": true,
+      "requires": {
+        "callsites": "^2.0.0"
+      }
+    },
+    "caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "dev": true,
+      "requires": {
+        "caller-callsite": "^2.0.0"
+      }
+    },
+    "callsites": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+      "dev": true
+    },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
+    },
+    "caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001031",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001031.tgz",
+      "integrity": "sha512-DpAP5a1NGRLgYfaNCaXIRyGARi+3tJA2quZXNNA1Du26VyVkqvy2tznNu5ANyN1Y5aX44QDotZSVSUSi2uMGjg==",
+      "dev": true
+    },
+    "case-sensitive-paths-webpack-plugin": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz",
+      "integrity": "sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ==",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1573282918610&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz",
+      "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npm.taobao.org/chardet/download/chardet-0.7.0.tgz",
+      "integrity": "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4=",
+      "dev": true
+    },
+    "check-types": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
+      "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==",
+      "dev": true
+    },
+    "chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "dev": true,
+      "requires": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      }
+    },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "chrome-trace-event": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "ci-info": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
+      "dev": true
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "clean-css": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
+      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+      "dev": true,
+      "requires": {
+        "source-map": "~0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npm.taobao.org/cli-cursor/download/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-highlight": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.4.tgz",
+      "integrity": "sha512-s7Zofobm20qriqDoU9sXptQx0t2R9PEgac92mENNm7xaEe1hn71IIMsXMK+6encA6WRCWWxIGQbipr3q998tlQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^3.0.0",
+        "highlight.js": "^9.6.0",
+        "mz": "^2.4.0",
+        "parse5": "^5.1.1",
+        "parse5-htmlparser2-tree-adapter": "^5.1.1",
+        "yargs": "^15.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "cli-spinners": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz",
+      "integrity": "sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==",
+      "dev": true
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npm.taobao.org/cli-width/download/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "clipboard": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz",
+      "integrity": "sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==",
+      "requires": {
+        "good-listener": "^1.2.2",
+        "select": "^1.1.2",
+        "tiny-emitter": "^2.0.0"
+      }
+    },
+    "clipboardy": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.2.0.tgz",
+      "integrity": "sha512-9ry9nC3VFULNmoEIqvuRwCIQ9M7wjnm4O+yvk7xkmhR+7FAUWaeX751oeYJbORg0h0zmqW1EVDoZK8f7yapwbg==",
+      "dev": true,
+      "requires": {
+        "arch": "^2.1.1",
+        "execa": "^1.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "dependencies": {
+        "is-wsl": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz",
+          "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==",
+          "dev": true
+        }
+      }
+    },
+    "cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        }
+      }
+    },
+    "clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "dev": true
+    },
+    "clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "requires": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      }
+    },
+    "coa": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "dev": true,
+      "requires": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
+        "q": "^1.1.2"
+      }
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
+    "codemirror": {
+      "version": "5.52.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.52.0.tgz",
+      "integrity": "sha512-K2UB6zjscrfME03HeRe/IuOmCeqNpw7PLKGHThYpLbZEuKf+ZoujJPhxZN4hHJS1O7QyzEsV7JJZGxuQWVaFCg=="
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
+      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.1",
+        "color-string": "^1.5.2"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-1.9.3.tgz",
+      "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "color-string": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
+      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "dev": true,
+      "requires": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dev": true,
+      "requires": {
+        "mime-db": ">= 1.43.0 < 2"
+      }
+    },
+    "compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+      "dev": true
+    },
+    "console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
+    },
+    "consolidate": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
+      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.1.1"
+      }
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "cookie": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "dev": true
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "dev": true
+    },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "copy-webpack-plugin": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz",
+      "integrity": "sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==",
+      "dev": true,
+      "requires": {
+        "cacache": "^12.0.3",
+        "find-cache-dir": "^2.1.0",
+        "glob-parent": "^3.1.0",
+        "globby": "^7.1.1",
+        "is-glob": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "minimatch": "^3.0.4",
+        "normalize-path": "^3.0.0",
+        "p-limit": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^2.1.2",
+        "webpack-log": "^2.0.0"
+      },
+      "dependencies": {
+        "globby": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+          "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+          "dev": true,
+          "requires": {
+            "array-union": "^1.0.1",
+            "dir-glob": "^2.0.0",
+            "glob": "^7.1.2",
+            "ignore": "^3.3.5",
+            "pify": "^3.0.0",
+            "slash": "^1.0.0"
+          }
+        },
+        "ignore": {
+          "version": "3.3.10",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+          "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+          "dev": true
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
+        "slash": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+          "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+          "dev": true
+        }
+      }
+    },
+    "core-js": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+      "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="
+    },
+    "core-js-compat": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz",
+      "integrity": "sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.8.3",
+        "semver": "7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+          "dev": true
+        }
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cosmiconfig": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "dev": true,
+      "requires": {
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
+      },
+      "dependencies": {
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        }
+      }
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz?cache=0&sync_timestamp=1570439926300&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-6.0.5.tgz",
+      "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
+      "dev": true,
+      "requires": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+      "dev": true
+    },
+    "css-declaration-sorter": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
+      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.1",
+        "timsort": "^0.3.0"
+      }
+    },
+    "css-loader": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.4.2.tgz",
+      "integrity": "sha512-jYq4zdZT0oS0Iykt+fqnzVLRIeiPWhka+7BqPn+oSIpWJAHak5tmB/WZrJ2a21JhCeFyNnnlroSl8c+MtVndzA==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "cssesc": "^3.0.0",
+        "icss-utils": "^4.1.1",
+        "loader-utils": "^1.2.3",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.23",
+        "postcss-modules-extract-imports": "^2.0.0",
+        "postcss-modules-local-by-default": "^3.0.2",
+        "postcss-modules-scope": "^2.1.1",
+        "postcss-modules-values": "^3.0.0",
+        "postcss-value-parser": "^4.0.2",
+        "schema-utils": "^2.6.0"
+      }
+    },
+    "css-select": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0",
+        "css-what": "^3.2.1",
+        "domutils": "^1.7.0",
+        "nth-check": "^1.0.2"
+      }
+    },
+    "css-select-base-adapter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+      "dev": true
+    },
+    "css-tree": {
+      "version": "1.0.0-alpha.37",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+      "dev": true,
+      "requires": {
+        "mdn-data": "2.0.4",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "css-what": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz",
+      "integrity": "sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==",
+      "dev": true
+    },
+    "cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true
+    },
+    "cssnano": {
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
+      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "cssnano-preset-default": "^4.0.7",
+        "is-resolvable": "^1.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "cssnano-preset-default": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
+      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
+      "dev": true,
+      "requires": {
+        "css-declaration-sorter": "^4.0.1",
+        "cssnano-util-raw-cache": "^4.0.1",
+        "postcss": "^7.0.0",
+        "postcss-calc": "^7.0.1",
+        "postcss-colormin": "^4.0.3",
+        "postcss-convert-values": "^4.0.1",
+        "postcss-discard-comments": "^4.0.2",
+        "postcss-discard-duplicates": "^4.0.2",
+        "postcss-discard-empty": "^4.0.1",
+        "postcss-discard-overridden": "^4.0.1",
+        "postcss-merge-longhand": "^4.0.11",
+        "postcss-merge-rules": "^4.0.3",
+        "postcss-minify-font-values": "^4.0.2",
+        "postcss-minify-gradients": "^4.0.2",
+        "postcss-minify-params": "^4.0.2",
+        "postcss-minify-selectors": "^4.0.2",
+        "postcss-normalize-charset": "^4.0.1",
+        "postcss-normalize-display-values": "^4.0.2",
+        "postcss-normalize-positions": "^4.0.2",
+        "postcss-normalize-repeat-style": "^4.0.2",
+        "postcss-normalize-string": "^4.0.2",
+        "postcss-normalize-timing-functions": "^4.0.2",
+        "postcss-normalize-unicode": "^4.0.1",
+        "postcss-normalize-url": "^4.0.1",
+        "postcss-normalize-whitespace": "^4.0.2",
+        "postcss-ordered-values": "^4.1.2",
+        "postcss-reduce-initial": "^4.0.3",
+        "postcss-reduce-transforms": "^4.0.2",
+        "postcss-svgo": "^4.0.2",
+        "postcss-unique-selectors": "^4.0.1"
+      }
+    },
+    "cssnano-util-get-arguments": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
+      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
+      "dev": true
+    },
+    "cssnano-util-get-match": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
+      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
+      "dev": true
+    },
+    "cssnano-util-raw-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
+      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "cssnano-util-same-parent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
+      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
+      "dev": true
+    },
+    "csso": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.2.tgz",
+      "integrity": "sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==",
+      "dev": true,
+      "requires": {
+        "css-tree": "1.0.0-alpha.37"
+      }
+    },
+    "current-script-polyfill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/current-script-polyfill/-/current-script-polyfill-1.0.0.tgz",
+      "integrity": "sha1-8xz35PPiGLBybnOMqSoC00iO9hU=",
+      "dev": true
+    },
+    "cyclist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
+      "dev": true
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "dayjs": {
+      "version": "1.8.21",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.21.tgz",
+      "integrity": "sha512-1kbWK0hziklUHkGgiKr7xm59KwAg/K3Tp7H/8X+f58DnNCwY3pKYjOCJpIlVs125FRBukGVZdKZojC073D0IeQ=="
+    },
+    "de-indent": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz",
+      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
+      "dev": true
+    },
+    "debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "dev": true,
+      "requires": {
+        "ms": "^2.1.1"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "deep-equal": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
+      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+      "dev": true,
+      "requires": {
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.1",
+        "is-regex": "^1.0.4",
+        "object-is": "^1.0.1",
+        "object-keys": "^1.1.1",
+        "regexp.prototype.flags": "^1.2.0"
+      }
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npm.taobao.org/deep-is/download/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "deepmerge": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
+      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
+    },
+    "default-gateway": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.5.tgz",
+      "integrity": "sha512-z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA==",
+      "dev": true,
+      "requires": {
+        "execa": "^3.3.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz",
+          "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "execa": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
+          "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.0",
+            "get-stream": "^5.0.0",
+            "human-signals": "^1.1.1",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.0",
+            "onetime": "^5.1.0",
+            "p-finally": "^2.0.0",
+            "signal-exit": "^3.0.2",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
+          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "is-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+          "dev": true
+        },
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+          "dev": true
+        },
+        "npm-run-path": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.0.0"
+          }
+        },
+        "onetime": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+          "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^2.1.0"
+          }
+        },
+        "p-finally": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
+          "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
+          "dev": true
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "defaults": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+      "dev": true,
+      "requires": {
+        "clone": "^1.0.2"
+      }
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "dev": true,
+      "requires": {
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
+      },
+      "dependencies": {
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "dev": true,
+          "requires": {
+            "array-union": "^1.0.1",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+              "dev": true
+            }
+          }
+        },
+        "p-map": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "delegate": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true
+    },
+    "des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true
+    },
+    "detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "dev": true
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "dir-glob": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+      "dev": true,
+      "requires": {
+        "path-type": "^3.0.0"
+      }
+    },
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
+      "dev": true
+    },
+    "dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "dev": true,
+      "requires": {
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "dev": true,
+      "requires": {
+        "buffer-indexof": "^1.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npm.taobao.org/doctrine/download/doctrine-3.0.0.tgz",
+      "integrity": "sha1-rd6+rXKmV023g2OdyHoSF3OXOWE=",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "dev": true,
+      "requires": {
+        "utila": "~0.4"
+      }
+    },
+    "dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+          "dev": true
+        }
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1"
+      }
+    },
+    "domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "dot-prop": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz",
+      "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==",
+      "dev": true,
+      "requires": {
+        "is-obj": "^2.0.0"
+      }
+    },
+    "dotenv": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
+      "dev": true
+    },
+    "dotenv-expand": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
+      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
+      "dev": true
+    },
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+      "dev": true
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "easy-stack": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.0.tgz",
+      "integrity": "sha1-EskbMIWjfwuqM26UhurEv5Tj54g=",
+      "dev": true
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "echarts": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.6.0.tgz",
+      "integrity": "sha512-xKkcr6v9UVOSF+PMuj7Ngt3bnzLwN1sSXWCvpvX+jYb3mePYsZnABq7wGkPac/m0nV653uGHXoHK8DCKCprdNg==",
+      "requires": {
+        "zrender": "4.2.0"
+      }
+    },
+    "echarts-amap": {
+      "version": "1.0.0-rc.6",
+      "resolved": "https://registry.npmjs.org/echarts-amap/-/echarts-amap-1.0.0-rc.6.tgz",
+      "integrity": "sha1-V4KnTa7lLtRM4/j2JXdWF4PwnhY="
+    },
+    "echarts-liquidfill": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/echarts-liquidfill/-/echarts-liquidfill-2.0.5.tgz",
+      "integrity": "sha512-3G19W5ngoh1L3BXYuD34g0Vd30ORWvQtyxRuL+7vmOZ3FkF6xkgD4pfcCL7QVAQOr+XZ4OiD2ot6dNGsRhflcg=="
+    },
+    "echarts-wordcloud": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/echarts-wordcloud/-/echarts-wordcloud-1.1.3.tgz",
+      "integrity": "sha512-Et8D5xEAoYkidmHun+hEH+2lF9dhCt6D0JJ390vlr2r/1zwhhZAbcL01CEvG93QcMcJpSvSPK8vRiGkTbMHRxg=="
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "ejs": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
+      "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
+      "dev": true
+    },
+    "electron-to-chromium": {
+      "version": "1.3.366",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.366.tgz",
+      "integrity": "sha512-MWtwlJaX/MqAH4V7j4pFasq2O4OIH7MltGTEVvzyeuUW+CPYsx+fuVg/MSBrTL4PzZjHidOixaELNy75/XFK1g==",
+      "dev": true
+    },
+    "element-ui": {
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.0.tgz",
+      "integrity": "sha512-KYsHWsBXYbLELS8cdfvgJTOMSUby3UEjvsPV1V1VmgJ/DdkOAS4z3MiOrPxrT9w2Cc5lZ4eVSQiGhYFR5NVChw==",
+      "requires": {
+        "async-validator": "~1.8.1",
+        "babel-helper-vue-jsx-merge-props": "^2.0.0",
+        "deepmerge": "^1.2.0",
+        "normalize-wheel": "^1.0.1",
+        "resize-observer-polyfill": "^1.5.0",
+        "throttle-debounce": "^1.0.1"
+      }
+    },
+    "elliptic": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
+      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
+      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.5.0",
+        "tapable": "^1.0.0"
+      },
+      "dependencies": {
+        "memory-fs": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+          "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+          "dev": true,
+          "requires": {
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
+          }
+        }
+      }
+    },
+    "entities": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+      "dev": true
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "error-stack-parser": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz",
+      "integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==",
+      "dev": true,
+      "requires": {
+        "stackframe": "^1.1.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.17.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
+      "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.1.5",
+        "is-regex": "^1.0.5",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimleft": "^2.1.1",
+        "string.prototype.trimright": "^2.1.1"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "eslint": {
+      "version": "5.16.0",
+      "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-5.16.0.tgz?cache=0&sync_timestamp=1576875900958&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-5.16.0.tgz",
+      "integrity": "sha1-oeOsGq5KP72Clvz496tzFMu2q+o=",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.9.1",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^4.0.3",
+        "eslint-utils": "^1.3.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^5.0.1",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.7.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^6.2.2",
+        "js-yaml": "^3.13.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.11",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.1",
+        "semver": "^5.5.1",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "^2.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz",
+          "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "import-fresh": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.2.1.tgz?cache=0&sync_timestamp=1573665074534&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.2.1.tgz",
+          "integrity": "sha1-Yz/2GFBueTr1rJG/SLcmd+FcvmY=",
+          "dev": true,
+          "requires": {
+            "parent-module": "^1.0.0",
+            "resolve-from": "^4.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
+          "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
+          "dev": true
+        },
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/resolve-from/download/resolve-from-4.0.0.tgz",
+          "integrity": "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "eslint-config-prettier": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npm.taobao.org/eslint-config-prettier/download/eslint-config-prettier-6.7.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-config-prettier%2Fdownload%2Feslint-config-prettier-6.7.0.tgz",
+      "integrity": "sha1-modpUuEt8rKErb00QJlL8fOd+7k=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "^6.0.0"
+      }
+    },
+    "eslint-loader": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz",
+      "integrity": "sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg==",
+      "dev": true,
+      "requires": {
+        "loader-fs-cache": "^1.0.0",
+        "loader-utils": "^1.0.2",
+        "object-assign": "^4.0.1",
+        "object-hash": "^1.1.4",
+        "rimraf": "^2.6.1"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "eslint-plugin-prettier": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npm.taobao.org/eslint-plugin-prettier/download/eslint-plugin-prettier-3.1.2.tgz",
+      "integrity": "sha1-Qy5aZnZmq4TOcvlFxy932Zalybo=",
+      "dev": true,
+      "requires": {
+        "prettier-linter-helpers": "^1.0.0"
+      }
+    },
+    "eslint-plugin-vue": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npm.taobao.org/eslint-plugin-vue/download/eslint-plugin-vue-5.2.3.tgz?cache=0&sync_timestamp=1573637114128&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-plugin-vue%2Fdownload%2Feslint-plugin-vue-5.2.3.tgz",
+      "integrity": "sha1-PudZfYI7VHiASy/rqYY7G3QnOWE=",
+      "dev": true,
+      "requires": {
+        "vue-eslint-parser": "^5.0.0"
+      }
+    },
+    "eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npm.taobao.org/eslint-scope/download/eslint-scope-4.0.3.tgz",
+      "integrity": "sha1-ygODMxD2iJoyZHgaqC5j65z+eEg=",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npm.taobao.org/eslint-utils/download/eslint-utils-1.4.3.tgz",
+      "integrity": "sha1-dP7HxU0Hdrb2fgJRBAtYBlZOmB8=",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^1.1.0"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npm.taobao.org/eslint-visitor-keys/download/eslint-visitor-keys-1.1.0.tgz",
+      "integrity": "sha1-4qgs6oT/JGrW+1f5veW0ZiFFnsI=",
+      "dev": true
+    },
+    "espree": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npm.taobao.org/espree/download/espree-5.0.1.tgz",
+      "integrity": "sha1-XWUm+k/H8HiKXPdbFfMDI+L4H3o=",
+      "dev": true,
+      "requires": {
+        "acorn": "^6.0.7",
+        "acorn-jsx": "^5.0.0",
+        "eslint-visitor-keys": "^1.0.0"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz",
+      "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/esquery/download/esquery-1.0.1.tgz",
+      "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npm.taobao.org/esrecurse/download/esrecurse-4.2.1.tgz",
+      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npm.taobao.org/estraverse/download/estraverse-4.3.0.tgz",
+      "integrity": "sha1-OYrT88WiSUi+dyXoPRGn3ijNvR0=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npm.taobao.org/esutils/download/esutils-2.0.3.tgz",
+      "integrity": "sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=",
+      "dev": true
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true
+    },
+    "event-pubsub": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz",
+      "integrity": "sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==",
+      "dev": true
+    },
+    "eventemitter3": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
+      "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
+      "dev": true
+    },
+    "events": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
+      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
+      "dev": true
+    },
+    "eventsource": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+      "dev": true,
+      "requires": {
+        "original": "^1.0.0"
+      }
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      }
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "express": {
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.7",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
+        "content-type": "~1.0.4",
+        "cookie": "0.4.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.1.2",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "dev": true
+        }
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npm.taobao.org/external-editor/download/external-editor-3.1.0.tgz",
+      "integrity": "sha1-ywP3QL764D6k0oPK7SdBqD8zVJU=",
+      "dev": true,
+      "requires": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-deep-equal%2Fdownload%2Ffast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
+    },
+    "fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/fast-diff/download/fast-diff-1.2.0.tgz",
+      "integrity": "sha1-c+4RmC2Gyq95WYKNUZz+kn+sXwM=",
+      "dev": true
+    },
+    "fast-glob": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
+      "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
+      "dev": true,
+      "requires": {
+        "@mrmlnc/readdir-enhanced": "^2.2.1",
+        "@nodelib/fs.stat": "^1.1.2",
+        "glob-parent": "^3.1.0",
+        "is-glob": "^4.0.0",
+        "merge2": "^1.2.3",
+        "micromatch": "^3.1.10"
+      }
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-json-stable-stringify%2Fdownload%2Ffast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM=",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npm.taobao.org/fast-levenshtein/download/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
+    "figgy-pudding": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
+      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "dev": true
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/figures/download/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npm.taobao.org/file-entry-cache/download/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha1-yg9u+m3T1WEzP7FFFQZcL6/fQ5w=",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^2.0.1"
+      }
+    },
+    "file-loader": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz",
+      "integrity": "sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^2.5.0"
+      }
+    },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
+    "filesize": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
+      "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
+      "dev": true
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      }
+    },
+    "find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^3.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/flat-cache/download/flat-cache-2.0.1.tgz",
+      "integrity": "sha1-XSltbwS9pEpGMKMBQTvbwuwIXsA=",
+      "dev": true,
+      "requires": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npm.taobao.org/rimraf/download/rimraf-2.6.3.tgz?cache=0&sync_timestamp=1569342479629&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frimraf%2Fdownload%2Frimraf-2.6.3.tgz",
+          "integrity": "sha1-stEE/g2Psnz54KHNqCYt04M8bKs=",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "flatted": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/flatted/download/flatted-2.0.1.tgz",
+      "integrity": "sha1-aeV8qo8OrLwoHS4stFjUb9tEngg=",
+      "dev": true
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "follow-redirects": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.10.0.tgz",
+      "integrity": "sha512-4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "dev": true
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
+      "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1",
+        "node-pre-gyp": "*"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "3.2.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "deep-extend": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.6.0"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minipass": {
+          "version": "2.9.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.3.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.9.0"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^3.2.6",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.14.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.1",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.2.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4.4.2"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "npm-normalize-package-bin": "^1.0.1"
+          }
+        },
+        "npm-normalize-package-bin": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.4.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "^0.6.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.7.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.13",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.8.6",
+            "minizlib": "^1.2.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.3"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "^1.0.2 || 2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/functional-red-black-tree/download/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "gensync": {
+      "version": "1.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
+      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "get-stdin": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npm.taobao.org/get-stdin/download/get-stdin-6.0.0.tgz",
+      "integrity": "sha1-ngm/cSs2CrkiXoEgSPcf3pyJZXs=",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npm.taobao.org/glob/download/glob-7.1.6.tgz?cache=0&sync_timestamp=1573078079496&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob%2Fdownload%2Fglob-7.1.6.tgz",
+      "integrity": "sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "requires": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
+      }
+    },
+    "glob-to-regexp": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
+      "dev": true
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npm.taobao.org/globals/download/globals-11.12.0.tgz",
+      "integrity": "sha1-q4eVM4hooLq9hSV1gBjCp+uVxC4=",
+      "dev": true
+    },
+    "globby": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
+      "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
+      "dev": true,
+      "requires": {
+        "@types/glob": "^7.1.1",
+        "array-union": "^1.0.2",
+        "dir-glob": "^2.2.2",
+        "fast-glob": "^2.2.6",
+        "glob": "^7.1.3",
+        "ignore": "^4.0.3",
+        "pify": "^4.0.1",
+        "slash": "^2.0.0"
+      }
+    },
+    "good-listener": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+      "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
+      "requires": {
+        "delegate": "^3.1.2"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+      "dev": true
+    },
+    "gzip-size": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
+      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
+      "dev": true,
+      "requires": {
+        "duplexer": "^0.1.1",
+        "pify": "^4.0.1"
+      }
+    },
+    "handle-thing": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
+      "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
+      "dev": true
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        }
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-symbols": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+      "dev": true
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "hash-sum": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
+      "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
+      "dev": true
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/he/download/he-1.2.0.tgz",
+      "integrity": "sha1-hK5l+n6vsWX922FWauFLrwVmTw8=",
+      "dev": true
+    },
+    "hex-color-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
+      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
+      "dev": true
+    },
+    "highlight.js": {
+      "version": "9.18.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz",
+      "integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg=="
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "hoopy": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
+      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
+      "dev": true
+    },
+    "hosted-git-info": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "dev": true
+    },
+    "hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "hsl-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
+      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
+      "dev": true
+    },
+    "hsla-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
+      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
+      "dev": true
+    },
+    "html-comment-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
+      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
+      "dev": true
+    },
+    "html-entities": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+      "dev": true
+    },
+    "html-minifier": {
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
+      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
+      "dev": true,
+      "requires": {
+        "camel-case": "3.0.x",
+        "clean-css": "4.2.x",
+        "commander": "2.17.x",
+        "he": "1.2.x",
+        "param-case": "2.1.x",
+        "relateurl": "0.2.x",
+        "uglify-js": "3.4.x"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+          "dev": true
+        }
+      }
+    },
+    "html-tags": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
+      "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=",
+      "dev": true
+    },
+    "html-webpack-plugin": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
+      "dev": true,
+      "requires": {
+        "html-minifier": "^3.2.3",
+        "loader-utils": "^0.2.16",
+        "lodash": "^4.17.3",
+        "pretty-error": "^2.0.2",
+        "tapable": "^1.0.0",
+        "toposort": "^1.0.0",
+        "util.promisify": "1.0.0"
+      },
+      "dependencies": {
+        "big.js": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+          "dev": true
+        },
+        "json5": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "dev": true
+        },
+        "loader-utils": {
+          "version": "0.2.17",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+          "dev": true,
+          "requires": {
+            "big.js": "^3.1.3",
+            "emojis-list": "^2.0.0",
+            "json5": "^0.5.0",
+            "object-assign": "^4.0.1"
+          }
+        },
+        "util.promisify": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+          "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.2",
+            "object.getownpropertydescriptors": "^2.0.3"
+          }
+        }
+      }
+    },
+    "htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "dev": true,
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
+      }
+    },
+    "http-parser-js": {
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
+      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
+      "dev": true
+    },
+    "http-proxy": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
+      "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+      "dev": true,
+      "requires": {
+        "http-proxy": "^1.17.0",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.11",
+        "micromatch": "^3.1.10"
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "dev": true
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz",
+      "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "icss-utils": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
+      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.14"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "dev": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npm.taobao.org/ignore/download/ignore-4.0.6.tgz",
+      "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=",
+      "dev": true
+    },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "requires": {
+        "import-from": "^2.1.0"
+      }
+    },
+    "import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "dev": true,
+      "requires": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npm.taobao.org/imurmurhash/download/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz",
+      "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=",
+      "dev": true
+    },
+    "inquirer": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npm.taobao.org/inquirer/download/inquirer-6.5.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finquirer%2Fdownload%2Finquirer-6.5.2.tgz",
+      "integrity": "sha1-rVCUI3XQNtMn/1KMCL1fqwiZKMo=",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^2.0.0",
+        "lodash": "^4.17.12",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz",
+          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "internal-ip": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+      "dev": true,
+      "requires": {
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
+      },
+      "dependencies": {
+        "default-gateway": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+          "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+          "dev": true,
+          "requires": {
+            "execa": "^1.0.0",
+            "ip-regex": "^2.1.0"
+          }
+        }
+      }
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "invert-kv": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+      "dev": true
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+      "dev": true
+    },
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "dev": true
+    },
+    "ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "dev": true
+    },
+    "is-absolute-url": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+      "dev": true
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-arguments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
+      "dev": true
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+      "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+      "dev": true
+    },
+    "is-ci": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
+      "dev": true,
+      "requires": {
+        "ci-info": "^1.5.0"
+      }
+    },
+    "is-color-stop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
+      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
+      "dev": true,
+      "requires": {
+        "css-color-names": "^0.0.4",
+        "hex-color-regex": "^1.1.0",
+        "hsl-regex": "^1.0.0",
+        "hsla-regex": "^1.0.0",
+        "rgb-regex": "^1.0.1",
+        "rgba-regex": "^1.0.0"
+      }
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
+      "dev": true
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+      "dev": true
+    },
+    "is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "^2.1.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "^1.0.2"
+      }
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npm.taobao.org/is-promise/download/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-svg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
+      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
+      "dev": true,
+      "requires": {
+        "html-comment-regex": "^1.1.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "javascript-stringify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.0.1.tgz",
+      "integrity": "sha512-yV+gqbd5vaOYjqlbk16EG89xB5udgjqQF3C5FAORDg4f/IS1Yc5ERCv5e/57yBcfJYw05V5JyIXabhwb75Xxow==",
+      "dev": true
+    },
+    "jest-worker": {
+      "version": "25.1.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz",
+      "integrity": "sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==",
+      "dev": true,
+      "requires": {
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "js-message": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.5.tgz",
+      "integrity": "sha1-IwDSSxrwjondCVvBpMnJz8uJLRU=",
+      "dev": true
+    },
+    "js-queue": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/js-queue/-/js-queue-2.0.0.tgz",
+      "integrity": "sha1-NiITz4YPRo8BJfxslqvBdCUx+Ug=",
+      "dev": true,
+      "requires": {
+        "easy-stack": "^1.0.0"
+      }
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npm.taobao.org/js-tokens/download/js-tokens-4.0.0.tgz",
+      "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk=",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.13.1.tgz",
+      "integrity": "sha1-r/FRswv9+o5J4F2iLnQV6d+jeEc=",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/json-stable-stringify-without-jsonify/download/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json3": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
+      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
+      "dev": true
+    },
+    "json5": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
+      "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "killable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
+      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
+      "dev": true
+    },
+    "kind-of": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "dev": true
+    },
+    "launch-editor": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.2.1.tgz",
+      "integrity": "sha512-On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.3.0",
+        "shell-quote": "^1.6.1"
+      }
+    },
+    "launch-editor-middleware": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.2.1.tgz",
+      "integrity": "sha512-s0UO2/gEGiCgei3/2UN3SMuUj1phjQN8lcpnvgLSz26fAzNWPQ6Nf/kF5IFClnfU2ehp6LrmKdMU/beveO+2jg==",
+      "dev": true,
+      "requires": {
+        "launch-editor": "^2.2.1"
+      }
+    },
+    "lcid": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+      "dev": true,
+      "requires": {
+        "invert-kv": "^2.0.0"
+      }
+    },
+    "leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true
+    },
+    "levenary": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
+      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
+      "dev": true,
+      "requires": {
+        "leven": "^3.1.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npm.taobao.org/levn/download/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "lines-and-columns": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+      "dev": true
+    },
+    "loader-fs-cache": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz",
+      "integrity": "sha512-70IzT/0/L+M20jUlEqZhZyArTU6VKLRTYRDAYN26g4jfzpJqjipLL3/hgYpySqI9PwsVRHHFja0LfEmsx9X2Cw==",
+      "dev": true,
+      "requires": {
+        "find-cache-dir": "^0.1.1",
+        "mkdirp": "0.5.1"
+      },
+      "dependencies": {
+        "find-cache-dir": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
+          "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "mkdirp": "^0.5.1",
+            "pkg-dir": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "pkg-dir": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
+          "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
+          "dev": true,
+          "requires": {
+            "find-up": "^1.0.0"
+          }
+        }
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.2.3.tgz",
+      "integrity": "sha1-H/XcaRHJ8KBiUxpMBLYJQGEIwsc=",
+      "dev": true,
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz",
+          "integrity": "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz",
+      "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=",
+      "dev": true
+    },
+    "lodash.defaultsdeep": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",
+      "integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==",
+      "dev": true
+    },
+    "lodash.kebabcase": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
+      "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=",
+      "dev": true
+    },
+    "lodash.mapvalues": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
+      "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=",
+      "dev": true
+    },
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
+    },
+    "lodash.transform": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz",
+      "integrity": "sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A=",
+      "dev": true
+    },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
+    "log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1"
+      }
+    },
+    "loglevel": {
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz",
+      "integrity": "sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "requires": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "requires": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      }
+    },
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
+      "dev": true
+    },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+      "dev": true,
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "mdn-data": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+      "dev": true
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
+    "mem": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+      "dev": true,
+      "requires": {
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+          "dev": true
+        }
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "dev": true
+    },
+    "merge-source-map": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
+      "dev": true,
+      "requires": {
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "merge2": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
+      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==",
+      "dev": true
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      }
+    },
+    "mime": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.43.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
+      "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.26",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
+      "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.43.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-1.2.0.tgz",
+      "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
+      "dev": true
+    },
+    "mini-css-extract-plugin": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
+      "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "normalize-url": "1.9.1",
+        "schema-utils": "^1.0.0",
+        "webpack-sources": "^1.1.0"
+      },
+      "dependencies": {
+        "normalize-url": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+          "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+          "dev": true,
+          "requires": {
+            "object-assign": "^4.0.1",
+            "prepend-http": "^1.0.0",
+            "query-string": "^4.1.0",
+            "sort-keys": "^1.0.0"
+          }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz",
+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "dev": true
+    },
+    "minipass": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
+      "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
+      "dev": true,
+      "requires": {
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
+    "minipass-collect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "minipass-pipeline": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz",
+      "integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npm.taobao.org/mkdirp/download/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        }
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "dev": true,
+      "requires": {
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
+      }
+    },
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+      "dev": true
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
+    "nan": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+      "dev": true,
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "dev": true
+    },
+    "neo-async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+      "dev": true
+    },
+    "netmodular-module-admin": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/netmodular-module-admin/-/netmodular-module-admin-1.2.6.tgz",
+      "integrity": "sha512-bBfv4bLygMbN4+5X75PChv5TJaYR2mPaoQZRPb+K2AQQVAT6KmjlBVu4+DfH84285AsYfqlzYTx7fPxskQkBgQ==",
+      "requires": {
+        "netmodular-skins-classics": "^1.0.1",
+        "netmodular-ui": "^1.5.6"
+      }
+    },
+    "netmodular-skins-classics": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/netmodular-skins-classics/-/netmodular-skins-classics-1.0.1.tgz",
+      "integrity": "sha512-41ZaNE1TTvvtK6SNns9+hbhRpP7GIHmEBFOWx/TinikgK+FF7qEDrAZm3t2mqcIxQ84uXIVYSgG3OFNxnxIYYw==",
+      "requires": {
+        "netmodular-ui": "^1.2.7"
+      }
+    },
+    "netmodular-ui": {
+      "version": "1.5.9",
+      "resolved": "https://registry.npmjs.org/netmodular-ui/-/netmodular-ui-1.5.9.tgz",
+      "integrity": "sha512-78JQ3h3m5QvNqgc4dNvAkBp3wldkqwct5x6gJG6qmuNO/uC92tG6QkVNdo3sTyToISlnUnQ+1tKKrpCz9W78Vw==",
+      "requires": {
+        "@babel/polyfill": "^7.8.3",
+        "axios": "^0.19.2",
+        "codemirror": "^5.51.0",
+        "core-js": "^3.3.2",
+        "dayjs": "^1.8.20",
+        "echarts": "^4.6.0",
+        "element-ui": "^2.12.0",
+        "netmodular-ui-map": "^1.0.3",
+        "nprogress": "^0.2.0",
+        "qs": "^6.9.1",
+        "resize-observer-polyfill": "^1.5.1",
+        "screenfull": "^4.2.1",
+        "store": "^2.0.12",
+        "v-charts": "^1.19.0",
+        "vue": "^2.6.10",
+        "vue-clipboard2": "^0.3.1",
+        "vue-highlightjs": "^1.3.3",
+        "vue-router": "^3.1.5",
+        "vuedraggable": "^2.23.0",
+        "vuep": "^0.8.1",
+        "vuex": "^3.1.2"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.9.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz",
+          "integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA=="
+        }
+      }
+    },
+    "netmodular-ui-map": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/netmodular-ui-map/-/netmodular-ui-map-1.0.3.tgz",
+      "integrity": "sha512-dHsVqbyGw7giWRAPwyPNhTwk9l2jUKGEuphz2ASzvDRMLDjbRSDlK+R0kH5OkhHY44Udg/Xwxejo19HnY36NUA==",
+      "requires": {
+        "core-js": "^3.4.7",
+        "element-ui": "^2.13.0",
+        "netmodular-ui": "^1.2.6",
+        "vue": "^2.6.10",
+        "vue-router": "^3.1.3",
+        "vuex": "^3.0.1"
+      }
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz",
+      "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y=",
+      "dev": true
+    },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "requires": {
+        "lower-case": "^1.1.1"
+      }
+    },
+    "node-forge": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
+      "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
+      "dev": true
+    },
+    "node-ipc": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.1.tgz",
+      "integrity": "sha512-FAyICv0sIRJxVp3GW5fzgaf9jwwRQxAKDJlmNFUL5hOy+W4X/I5AypyHoq0DXXbo9o/gt79gj++4cMr4jVWE/w==",
+      "dev": true,
+      "requires": {
+        "event-pubsub": "4.3.0",
+        "js-message": "1.0.5",
+        "js-queue": "2.0.0"
+      }
+    },
+    "node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "node-releases": {
+      "version": "1.1.50",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz",
+      "integrity": "sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "normalize-url": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+      "dev": true
+    },
+    "normalize-wheel": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "nprogress": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
+      "integrity": "sha1-y480xTIT2JVyP8urkH6UIq28r7E="
+    },
+    "nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "dev": true,
+      "requires": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "numerify": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/numerify/-/numerify-1.2.9.tgz",
+      "integrity": "sha512-X4QzQiytV5ZN3TVLhzbtFzjTarUNnaa1pgNDFqt7u7Nqhxe7FvY2eYrGt4WYHlYXDqgtfC/n/a5nJ2y0LijV8w=="
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-hash": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
+      "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==",
+      "dev": true
+    },
+    "object-inspect": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
+      "dev": true
+    },
+    "object-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz",
+      "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==",
+      "dev": true
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "object.values": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
+      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      }
+    },
+    "obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npm.taobao.org/once/download/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/onetime/download/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "open": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
+      "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
+      "dev": true,
+      "requires": {
+        "is-wsl": "^1.1.0"
+      }
+    },
+    "opener": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz",
+      "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==",
+      "dev": true
+    },
+    "opn": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+      "dev": true,
+      "requires": {
+        "is-wsl": "^1.1.0"
+      }
+    },
+    "optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npm.taobao.org/optionator/download/optionator-0.8.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Foptionator%2Fdownload%2Foptionator-0.8.3.tgz",
+      "integrity": "sha1-hPodA2/p08fiHZmIS2ARZ+yPtJU=",
+      "dev": true,
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      }
+    },
+    "ora": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
+      "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-spinners": "^2.0.0",
+        "log-symbols": "^2.2.0",
+        "strip-ansi": "^5.2.0",
+        "wcwidth": "^1.0.1"
+      },
+      "dependencies": {
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "original": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
+      "dev": true,
+      "requires": {
+        "url-parse": "^1.4.3"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+      "dev": true,
+      "requires": {
+        "execa": "^1.0.0",
+        "lcid": "^2.0.0",
+        "mem": "^4.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+      "dev": true
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+      "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+      "dev": true,
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^2.0.0"
+      }
+    },
+    "p-map": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+      "dev": true,
+      "requires": {
+        "aggregate-error": "^3.0.0"
+      }
+    },
+    "p-retry": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
+      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+      "dev": true,
+      "requires": {
+        "retry": "^0.12.0"
+      }
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true
+    },
+    "pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
+    },
+    "parallel-transform": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "dev": true,
+      "requires": {
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/parent-module/download/parent-module-1.0.1.tgz",
+      "integrity": "sha1-aR0nCeeMefrjoVZiJFLQB2LKqqI=",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      },
+      "dependencies": {
+        "callsites": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npm.taobao.org/callsites/download/callsites-3.1.0.tgz",
+          "integrity": "sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M=",
+          "dev": true
+        }
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
+      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+      "dev": true,
+      "requires": {
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "parse-json": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
+      "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1",
+        "lines-and-columns": "^1.1.6"
+      }
+    },
+    "parse5": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "dev": true
+    },
+    "parse5-htmlparser2-tree-adapter": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-5.1.1.tgz",
+      "integrity": "sha512-CF+TKjXqoqyDwHqBhFQ+3l5t83xYi6fVT1tQNg+Ye0JRLnTxWvIroCjEp1A0k4lneHNBGnICUf0cfYVYGEazqw==",
+      "dev": true,
+      "requires": {
+        "parse5": "^5.1.1"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/path-is-inside/download/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/path-key/download/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
+      "requires": {
+        "pify": "^3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
+      }
+    },
+    "pbkdf2": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "dev": true,
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "dev": true,
+      "requires": {
+        "find-up": "^3.0.0"
+      }
+    },
+    "pnp-webpack-plugin": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
+      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
+      "dev": true,
+      "requires": {
+        "ts-pnp": "^1.1.6"
+      }
+    },
+    "portfinder": {
+      "version": "1.0.25",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
+      "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==",
+      "dev": true,
+      "requires": {
+        "async": "^2.6.2",
+        "debug": "^3.1.1",
+        "mkdirp": "^0.5.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "postcss": {
+      "version": "7.0.27",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz",
+      "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "postcss-calc": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz",
+      "integrity": "sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.27",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "postcss-colormin": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "color": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-convert-values": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
+      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-discard-comments": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-duplicates": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
+      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-empty": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
+      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-overridden": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
+      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-load-config": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
+      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "import-cwd": "^2.0.0"
+      }
+    },
+    "postcss-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "postcss-merge-longhand": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+      "dev": true,
+      "requires": {
+        "css-color-names": "0.0.4",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "stylehacks": "^4.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-merge-rules": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "cssnano-util-same-parent": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0",
+        "vendors": "^1.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-minify-font-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
+      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-minify-gradients": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "is-color-stop": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-minify-params": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "browserslist": "^4.0.0",
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "uniqs": "^2.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-minify-selectors": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-modules-extract-imports": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
+      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.5"
+      }
+    },
+    "postcss-modules-local-by-default": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz",
+      "integrity": "sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==",
+      "dev": true,
+      "requires": {
+        "icss-utils": "^4.1.1",
+        "postcss": "^7.0.16",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.0"
+      }
+    },
+    "postcss-modules-scope": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz",
+      "integrity": "sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0"
+      }
+    },
+    "postcss-modules-values": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
+      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
+      "dev": true,
+      "requires": {
+        "icss-utils": "^4.0.0",
+        "postcss": "^7.0.6"
+      }
+    },
+    "postcss-normalize-charset": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
+      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-normalize-display-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-positions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-repeat-style": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-string": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-timing-functions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-unicode": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
+      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-url": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
+      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+      "dev": true,
+      "requires": {
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-whitespace": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-ordered-values": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-reduce-initial": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-reduce-transforms": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
+      "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^3.0.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "postcss-svgo": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
+      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
+      "dev": true,
+      "requires": {
+        "is-svg": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "svgo": "^1.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-unique-selectors": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
+      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "postcss": "^7.0.0",
+        "uniqs": "^2.0.0"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz",
+      "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npm.taobao.org/prelude-ls/download/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true
+    },
+    "prettier": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npm.taobao.org/prettier/download/prettier-1.19.1.tgz",
+      "integrity": "sha1-99f1/4qc2HKnvkyhQglZVqYHl8s=",
+      "dev": true
+    },
+    "prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/prettier-linter-helpers/download/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha1-0j1B/hN1ZG3i0BBNNFSjAIgCz3s=",
+      "dev": true,
+      "requires": {
+        "fast-diff": "^1.1.2"
+      }
+    },
+    "pretty-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
+      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+      "dev": true,
+      "requires": {
+        "renderkid": "^2.0.1",
+        "utila": "~0.4"
+      }
+    },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npm.taobao.org/progress/download/progress-2.0.3.tgz",
+      "integrity": "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg=",
+      "dev": true
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
+    "proxy-addr": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "dev": true,
+      "requires": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.9.1"
+      }
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz",
+      "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==",
+      "dev": true
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz",
+      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
+      "dev": true
+    },
+    "q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
+    },
+    "query-string": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      }
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "querystringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
+      "dev": true
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true
+    },
+    "raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
+    "raw-loader": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npm.taobao.org/raw-loader/download/raw-loader-3.1.0.tgz",
+      "integrity": "sha1-Xp05mloiLMDeGPQsO8XklndTKz8=",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^2.0.1"
+      }
+    },
+    "read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "requires": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "regenerate": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "dev": true
+    },
+    "regenerate-unicode-properties": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
+      "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.0"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
+      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
+    },
+    "regenerator-transform": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz",
+      "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==",
+      "dev": true,
+      "requires": {
+        "private": "^0.1.6"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "regexp.prototype.flags": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
+      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      }
+    },
+    "regexpp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/regexpp/download/regexpp-2.0.1.tgz",
+      "integrity": "sha1-jRnTHPYySCtYkEn4KB+T28uk0H8=",
+      "dev": true
+    },
+    "regexpu-core": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
+      "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.1.0",
+        "regjsgen": "^0.5.0",
+        "regjsparser": "^0.6.0",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.1.0"
+      }
+    },
+    "regjsgen": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz",
+      "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.3.tgz",
+      "integrity": "sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA==",
+      "dev": true,
+      "requires": {
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "dev": true
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "renderkid": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
+      "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
+      "dev": true,
+      "requires": {
+        "css-select": "^1.1.0",
+        "dom-converter": "^0.2",
+        "htmlparser2": "^3.3.0",
+        "strip-ansi": "^3.0.0",
+        "utila": "^0.4.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "css-select": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+          "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+          "dev": true,
+          "requires": {
+            "boolbase": "~1.0.0",
+            "css-what": "2.1",
+            "domutils": "1.5.1",
+            "nth-check": "~1.0.1"
+          }
+        },
+        "css-what": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+          "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+          "dev": true
+        },
+        "domutils": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+          "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+          "dev": true,
+          "requires": {
+            "dom-serializer": "0",
+            "domelementtype": "1"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
+      }
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "request-promise-core": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
+      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.15"
+      }
+    },
+    "request-promise-native": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
+      "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
+      "dev": true,
+      "requires": {
+        "request-promise-core": "1.1.3",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
+    "resize-observer-polyfill": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+    },
+    "resolve": {
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
+      "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+      "dev": true,
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/restore-cursor/download/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "dev": true
+    },
+    "rgb-regex": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
+      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
+      "dev": true
+    },
+    "rgba-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
+      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npm.taobao.org/run-async/download/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "rxjs": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npm.taobao.org/rxjs/download/rxjs-6.5.3.tgz",
+      "integrity": "sha1-UQ4mMX9NuRp+sd532d2boKSJmjo=",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz",
+      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
+      "dev": true
+    },
+    "sass": {
+      "version": "1.26.2",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.2.tgz",
+      "integrity": "sha512-9TRp1d1NH0mWH8rqaR/jCS05f/TFD1ykPF2zSYviprMhLb0EmXVqtKMUHsvDt3YIT/jbSK6qAvUlfCW/HJkdCw==",
+      "dev": true,
+      "requires": {
+        "chokidar": ">=2.0.0 <4.0.0"
+      }
+    },
+    "sass-loader": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
+      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+      "dev": true,
+      "requires": {
+        "clone-deep": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.6.1",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "schema-utils": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.6.1.tgz",
+      "integrity": "sha1-63jwuUXHvPoggrNWXo2zVIAR3E8=",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1"
+      }
+    },
+    "screenfull": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-4.2.1.tgz",
+      "integrity": "sha512-PLSp6f5XdhvjCCCO8OjavRfzkSGL3Qmdm7P82bxyU8HDDDBhDV3UckRaYcRa/NDNTYt8YBpzjoLWHUAejmOjLg=="
+    },
+    "select": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+      "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
+    },
+    "select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
+      "dev": true
+    },
+    "selfsigned": {
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
+      "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
+      "dev": true,
+      "requires": {
+        "node-forge": "0.9.0"
+      }
+    },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz",
+      "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
+      "dev": true
+    },
+    "send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.7.2",
+        "mime": "1.6.0",
+        "ms": "2.1.1",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          },
+          "dependencies": {
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true
+            }
+          }
+        },
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "serialize-javascript": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
+      "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
+      "dev": true
+    },
+    "serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+          "dev": true
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "dev": true,
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^6.0.2"
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/shebang-command/download/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/shebang-regex/download/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "shell-quote": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
+      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "simple-assign": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/simple-assign/-/simple-assign-0.1.0.tgz",
+      "integrity": "sha1-F/0wZqXz13OPUDIbsPFMooHMS6o="
+    },
+    "simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.3.1"
+      },
+      "dependencies": {
+        "is-arrayish": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+          "dev": true
+        }
+      }
+    },
+    "slash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npm.taobao.org/slice-ansi/download/slice-ansi-2.1.0.tgz",
+      "integrity": "sha1-ys12k0YaY3pXiNkqfdT7oGjoFjY=",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "sockjs": {
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+      "dev": true,
+      "requires": {
+        "faye-websocket": "^0.10.0",
+        "uuid": "^3.0.1"
+      }
+    },
+    "sockjs-client": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
+      "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.5",
+        "eventsource": "^1.0.7",
+        "faye-websocket": "~0.11.1",
+        "inherits": "^2.0.3",
+        "json3": "^3.3.2",
+        "url-parse": "^1.4.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "faye-websocket": {
+          "version": "0.11.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+          "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+          "dev": true,
+          "requires": {
+            "websocket-driver": ">=0.5.1"
+          }
+        }
+      }
+    },
+    "sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "dev": true,
+      "requires": {
+        "is-plain-obj": "^1.0.0"
+      }
+    },
+    "sortablejs": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+      "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
+    },
+    "source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "dev": true,
+      "requires": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
+      "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "dev": true
+    },
+    "spdy": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
+      "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      }
+    },
+    "spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dev": true,
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "requires": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "dev": true
+    },
+    "stackframe": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.1.1.tgz",
+      "integrity": "sha512-0PlYhdKh6AfFxRyK/v+6/k+/mMfyiEBbTM5L94D0ZytQnJ166wuwoTYLHFWGbs2dpA8Rgq763KGWmN1EQEYHRQ==",
+      "dev": true
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true
+    },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "dev": true
+    },
+    "store": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/store/-/store-2.0.12.tgz",
+      "integrity": "sha1-jFNOKguDH3K3X8XxEZhXxE711ZM="
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "dev": true
+    },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz?cache=0&sync_timestamp=1573488535785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-2.1.1.tgz",
+      "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "string.prototype.trimleft": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
+      "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string.prototype.trimright": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
+      "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        }
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true
+    },
+    "strip-indent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+      "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/strip-json-comments/download/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "stylehacks": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
+      "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "svg-tags": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
+      "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
+      "dev": true
+    },
+    "svgo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
+        "css-select": "^2.0.0",
+        "css-select-base-adapter": "^0.1.1",
+        "css-tree": "1.0.0-alpha.37",
+        "csso": "^4.0.2",
+        "js-yaml": "^3.13.1",
+        "mkdirp": "~0.5.1",
+        "object.values": "^1.1.0",
+        "sax": "~1.2.4",
+        "stable": "^0.1.8",
+        "unquote": "~1.1.1",
+        "util.promisify": "~1.0.0"
+      }
+    },
+    "table": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npm.taobao.org/table/download/table-5.4.6.tgz",
+      "integrity": "sha1-EpLRlQDOP4YFOwXw6Ofko7shB54=",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npm.taobao.org/emoji-regex/download/emoji-regex-7.0.3.tgz",
+          "integrity": "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-3.1.0.tgz?cache=0&sync_timestamp=1573488535785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-3.1.0.tgz",
+          "integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz",
+          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true
+    },
+    "terser": {
+      "version": "4.6.5",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.5.tgz",
+      "integrity": "sha512-LqajFf1pIGw6IeZmNuLa9Wq0Vu48wcPu3jEnuoIFx9KrW+tGuhc72Mi9ZDfbazzFtMOD9gifhmQdRxc4i4jfcg==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz",
+      "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==",
+      "dev": true,
+      "requires": {
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^2.1.2",
+        "source-map": "^0.6.1",
+        "terser": "^4.1.2",
+        "webpack-sources": "^1.4.0",
+        "worker-farm": "^1.7.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "thenify": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
+      "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dev": true,
+      "requires": {
+        "thenify": ">= 3.1.0 < 4"
+      }
+    },
+    "thread-loader": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.3.tgz",
+      "integrity": "sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg==",
+      "dev": true,
+      "requires": {
+        "loader-runner": "^2.3.1",
+        "loader-utils": "^1.1.0",
+        "neo-async": "^2.6.0"
+      }
+    },
+    "throttle-debounce": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
+      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "dev": true
+    },
+    "timers-browserify": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "timsort": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+      "dev": true
+    },
+    "tiny-emitter": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz",
+      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true
+    },
+    "toposort": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
+      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=",
+      "dev": true
+    },
+    "tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dev": true,
+      "requires": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      }
+    },
+    "tryer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
+      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
+      "dev": true
+    },
+    "ts-pnp": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.6.tgz",
+      "integrity": "sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ==",
+      "dev": true
+    },
+    "tslib": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npm.taobao.org/tslib/download/tslib-1.10.0.tgz",
+      "integrity": "sha1-w8GflZc/sKYpc/sJ2Q2WHuQ+XIo=",
+      "dev": true
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npm.taobao.org/type-check/download/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-fest": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "dev": true
+    },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "3.4.10",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
+      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
+      "dev": true,
+      "requires": {
+        "commander": "~2.19.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "unicode-canonical-property-names-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "dev": true
+    },
+    "unicode-match-property-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "dev": true,
+      "requires": {
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
+      }
+    },
+    "unicode-match-property-value-ecmascript": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
+      "dev": true
+    },
+    "unicode-property-aliases-ecmascript": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
+      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "uniqs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
+      "dev": true
+    },
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
+    "unquote": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
+      "dev": true
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        }
+      }
+    },
+    "upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true
+    },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz",
+      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "url-loader": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.3.0.tgz",
+      "integrity": "sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.2.3",
+        "mime": "^2.4.4",
+        "schema-utils": "^2.5.0"
+      }
+    },
+    "url-parse": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "dev": true,
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "util.promisify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
+      }
+    },
+    "utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
+      "dev": true
+    },
+    "utils-lite": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/utils-lite/-/utils-lite-0.1.10.tgz",
+      "integrity": "sha512-jlHvdtI8MyWURF/3u+ufIjf1Cs5WjN6WZl9qO8dEkZsVjaI7X5YMUhaCFzkvB69ljt6fo4Dd7V/Oj2NJOFDFOQ=="
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "dev": true
+    },
+    "v-charts": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/v-charts/-/v-charts-1.19.0.tgz",
+      "integrity": "sha512-vm2HBUmxAsXK0ivwce9LytcpqrItDA5JSPLYVxZXtiuoyhcn80XX1/3dPJd/1GqG1OYv3jfBo1s9ra4q8GowqA==",
+      "requires": {
+        "echarts-amap": "1.0.0-rc.6",
+        "echarts-liquidfill": "^2.0.2",
+        "echarts-wordcloud": "^1.1.3",
+        "numerify": "1.2.9",
+        "utils-lite": "0.1.10"
+      }
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "dev": true
+    },
+    "vendors": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
+      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
+      "dev": true
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true
+    },
+    "vue": {
+      "version": "2.6.11",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
+      "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
+    },
+    "vue-clipboard2": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.1.tgz",
+      "integrity": "sha512-H5S/agEDj0kXjUb5GP2c0hCzIXWRBygaWLN3NEFsaI9I3uWin778SFEMt8QRXiPG+7anyjqWiw2lqcxWUSfkYg==",
+      "requires": {
+        "clipboard": "^2.0.0"
+      }
+    },
+    "vue-eslint-parser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-5.0.0.tgz",
+      "integrity": "sha1-APTk2pTsl0uCGib/DtD3p4QCuKE=",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "eslint-scope": "^4.0.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^4.1.0",
+        "esquery": "^1.0.1",
+        "lodash": "^4.17.11"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz",
+          "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "espree": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npm.taobao.org/espree/download/espree-4.1.0.tgz",
+          "integrity": "sha1-co1UUeD9FWwEOEp62J7VH/VOsl8=",
+          "dev": true,
+          "requires": {
+            "acorn": "^6.0.2",
+            "acorn-jsx": "^5.0.0",
+            "eslint-visitor-keys": "^1.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
+          "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
+          "dev": true
+        }
+      }
+    },
+    "vue-highlightjs": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/vue-highlightjs/-/vue-highlightjs-1.3.3.tgz",
+      "integrity": "sha1-KaDVcTL8HOFc+mHolpGPW3GMXVI=",
+      "requires": {
+        "highlight.js": "*"
+      }
+    },
+    "vue-hot-reload-api": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
+      "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
+      "dev": true
+    },
+    "vue-loader": {
+      "version": "15.9.0",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.0.tgz",
+      "integrity": "sha512-FeDHvTSpwyLeF7LIV1PYkvqUQgTJ8UmOxhSlCyRSxaXCKk+M6NF4tDQsLsPPNeDPyR7TfRQ8MLg6v+8PsDV9xQ==",
+      "dev": true,
+      "requires": {
+        "@vue/component-compiler-utils": "^3.1.0",
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.1.0",
+        "vue-hot-reload-api": "^2.3.0",
+        "vue-style-loader": "^4.1.0"
+      },
+      "dependencies": {
+        "hash-sum": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+          "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
+          "dev": true
+        }
+      }
+    },
+    "vue-router": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz",
+      "integrity": "sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA=="
+    },
+    "vue-style-loader": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
+      "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==",
+      "dev": true,
+      "requires": {
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.0.2"
+      },
+      "dependencies": {
+        "hash-sum": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+          "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
+          "dev": true
+        }
+      }
+    },
+    "vue-template-compiler": {
+      "version": "2.6.11",
+      "resolved": "https://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.6.11.tgz",
+      "integrity": "sha1-wEcE749JixUxMAGJk+VjCdRpgIA=",
+      "dev": true,
+      "requires": {
+        "de-indent": "^1.0.2",
+        "he": "^1.1.0"
+      }
+    },
+    "vue-template-es2015-compiler": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
+      "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
+      "dev": true
+    },
+    "vuedraggable": {
+      "version": "2.23.2",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.23.2.tgz",
+      "integrity": "sha512-PgHCjUpxEAEZJq36ys49HfQmXglattf/7ofOzUrW2/rRdG7tu6fK84ir14t1jYv4kdXewTEa2ieKEAhhEMdwkQ==",
+      "requires": {
+        "sortablejs": "^1.10.1"
+      }
+    },
+    "vuep": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/vuep/-/vuep-0.8.1.tgz",
+      "integrity": "sha512-D4ClmdZ37Itb57KdW9FPqE5820ENAFuJFmc7KyzGfoGBDhVHYxgF/pUbeTjpGe4VF0u2lGQVItfZ1xlh9nMpWg==",
+      "requires": {
+        "simple-assign": "^0.1.0"
+      }
+    },
+    "vuex": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.2.tgz",
+      "integrity": "sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ=="
+    },
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      }
+    },
+    "wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "requires": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+      "dev": true,
+      "requires": {
+        "defaults": "^1.0.3"
+      }
+    },
+    "webpack": {
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz",
+      "integrity": "sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/wasm-edit": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "acorn": "^6.2.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.3",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.1",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.3",
+        "watchpack": "^1.6.0",
+        "webpack-sources": "^1.4.1"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "webpack-bundle-analyzer": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz",
+      "integrity": "sha512-orUfvVYEfBMDXgEKAKVvab5iQ2wXneIEorGNsyuOyVYpjYrI7CUOhhXNDd3huMwQ3vNNWWlGP+hzflMFYNzi2g==",
+      "dev": true,
+      "requires": {
+        "acorn": "^6.0.7",
+        "acorn-walk": "^6.1.1",
+        "bfj": "^6.1.1",
+        "chalk": "^2.4.1",
+        "commander": "^2.18.0",
+        "ejs": "^2.6.1",
+        "express": "^4.16.3",
+        "filesize": "^3.6.1",
+        "gzip-size": "^5.0.0",
+        "lodash": "^4.17.15",
+        "mkdirp": "^0.5.1",
+        "opener": "^1.5.1",
+        "ws": "^6.0.0"
+      },
+      "dependencies": {
+        "acorn-walk": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
+          "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
+          "dev": true
+        }
+      }
+    },
+    "webpack-chain": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.4.0.tgz",
+      "integrity": "sha512-f97PYqxU+9/u0IUqp/ekAHRhBD1IQwhBv3wlJo2nvyELpr2vNnUqO3XQEk+qneg0uWGP54iciotszpjfnEExFA==",
+      "dev": true,
+      "requires": {
+        "deepmerge": "^1.5.2",
+        "javascript-stringify": "^2.0.1"
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
+      "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
+      "dev": true,
+      "requires": {
+        "memory-fs": "^0.4.1",
+        "mime": "^2.4.4",
+        "mkdirp": "^0.5.1",
+        "range-parser": "^1.2.1",
+        "webpack-log": "^2.0.0"
+      }
+    },
+    "webpack-dev-server": {
+      "version": "3.10.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz",
+      "integrity": "sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==",
+      "dev": true,
+      "requires": {
+        "ansi-html": "0.0.7",
+        "bonjour": "^3.5.0",
+        "chokidar": "^2.1.8",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^1.6.0",
+        "debug": "^4.1.1",
+        "del": "^4.1.1",
+        "express": "^4.17.1",
+        "html-entities": "^1.2.1",
+        "http-proxy-middleware": "0.19.1",
+        "import-local": "^2.0.0",
+        "internal-ip": "^4.3.0",
+        "ip": "^1.1.5",
+        "is-absolute-url": "^3.0.3",
+        "killable": "^1.0.1",
+        "loglevel": "^1.6.6",
+        "opn": "^5.5.0",
+        "p-retry": "^3.0.1",
+        "portfinder": "^1.0.25",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.10.7",
+        "semver": "^6.3.0",
+        "serve-index": "^1.9.1",
+        "sockjs": "0.3.19",
+        "sockjs-client": "1.4.0",
+        "spdy": "^4.0.1",
+        "strip-ansi": "^3.0.1",
+        "supports-color": "^6.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^3.7.2",
+        "webpack-log": "^2.0.0",
+        "ws": "^6.2.1",
+        "yargs": "12.0.5"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "get-caller-file": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+          "dev": true
+        },
+        "is-absolute-url": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+          "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "require-main-filename": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            }
+          }
+        },
+        "yargs": {
+          "version": "12.0.5",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^3.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^11.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
+    "webpack-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^3.0.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "webpack-merge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.15"
+      }
+    },
+    "webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "websocket-driver": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
+      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
+      "dev": true,
+      "requires": {
+        "http-parser-js": ">=0.4.0 <0.4.11",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "dev": true
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwhich%2Fdownload%2Fwhich-1.3.1.tgz",
+      "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npm.taobao.org/word-wrap/download/word-wrap-1.2.3.tgz",
+      "integrity": "sha1-YQY29rH3A4kb00dxzLF/uTtHB5w=",
+      "dev": true
+    },
+    "worker-farm": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "dev": true,
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
+    "wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npm.taobao.org/write/download/write-1.0.3.tgz",
+      "integrity": "sha1-CADhRSO5I6OH5BUSPIZWFqrg9cM=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "ws": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "dev": true,
+      "requires": {
+        "async-limiter": "~1.0.0"
+      }
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
+      "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
+      "dev": true,
+      "requires": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^16.1.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz",
+      "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "yorkie": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz",
+      "integrity": "sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw==",
+      "dev": true,
+      "requires": {
+        "execa": "^0.8.0",
+        "is-ci": "^1.0.10",
+        "normalize-path": "^1.0.0",
+        "strip-indent": "^2.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "0.8.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz",
+          "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^5.0.1",
+            "get-stream": "^3.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "dev": true,
+          "requires": {
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
+          }
+        },
+        "normalize-path": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
+          "integrity": "sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=",
+          "dev": true
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+          "dev": true
+        }
+      }
+    },
+    "zrender": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.2.0.tgz",
+      "integrity": "sha512-YJ9hxt5uFincYYU3KK31+Ce+B6PJmYYK0Q9fQ6jOUAoC/VHbe4kCKAPkxKeT7jGTxrK5wYu18R0TLGqj2zbEOA=="
+    }
+  }
+}
diff --git a/src/UI/module-code-generator/package.json b/src/UI/module-codegenerator/package.json
similarity index 69%
rename from src/UI/module-code-generator/package.json
rename to src/UI/module-codegenerator/package.json
index 272c20c..ef421b9 100644
--- a/src/UI/module-code-generator/package.json
+++ b/src/UI/module-codegenerator/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "netmodular-module-code-generator",
-  "version": "1.1.0",
+  "name": "netmodular-module-codegenerator",
+  "version": "1.0.0",
   "author": "Oldli",
   "license": "ISC",
   "code": "codeGenerator",
@@ -18,25 +18,25 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.2.3",
-    "netmodular-ui": "^1.5.3"
+    "netmodular-module-admin": "^1.2.6",
+    "netmodular-ui": "^1.5.9"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.2.2",
-    "@vue/cli-plugin-eslint": "^4.2.2",
-    "@vue/cli-plugin-router": "^4.2.2",
-    "@vue/cli-plugin-vuex": "^4.2.2",
-    "@vue/cli-service": "^4.2.2",
+    "@vue/cli-plugin-babel": "^4.2.3",
+    "@vue/cli-plugin-eslint": "^4.2.3",
+    "@vue/cli-plugin-router": "^4.2.3",
+    "@vue/cli-plugin-vuex": "^4.2.3",
+    "@vue/cli-service": "^4.2.3",
     "@vue/eslint-config-prettier": "^5.0.0",
-    "babel-eslint": "^10.0.3",
+    "babel-eslint": "^10.1.0",
     "eslint": "^5.16.0",
     "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-vue": "^5.0.0",
     "prettier": "^1.18.2",
     "raw-loader": "^3.1.0",
     "rimraf": "^3.0.2",
-    "sass": "^1.25.0",
+    "sass": "^1.26.2",
     "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.11"
   }
-}
+}
\ No newline at end of file
diff --git a/src/UI/module-code-generator/postcss.config.js b/src/UI/module-codegenerator/postcss.config.js
similarity index 100%
rename from src/UI/module-code-generator/postcss.config.js
rename to src/UI/module-codegenerator/postcss.config.js
diff --git a/src/UI/module-code-generator/src/api/components/class.js b/src/UI/module-codegenerator/src/api/components/class.js
similarity index 100%
rename from src/UI/module-code-generator/src/api/components/class.js
rename to src/UI/module-codegenerator/src/api/components/class.js
diff --git a/src/UI/module-code-generator/src/api/components/enum.js b/src/UI/module-codegenerator/src/api/components/enum.js
similarity index 100%
rename from src/UI/module-code-generator/src/api/components/enum.js
rename to src/UI/module-codegenerator/src/api/components/enum.js
diff --git a/src/UI/module-code-generator/src/api/components/enumItem.js b/src/UI/module-codegenerator/src/api/components/enumItem.js
similarity index 100%
rename from src/UI/module-code-generator/src/api/components/enumItem.js
rename to src/UI/module-codegenerator/src/api/components/enumItem.js
diff --git a/src/UI/module-code-generator/src/api/components/modelProperty.js b/src/UI/module-codegenerator/src/api/components/modelProperty.js
similarity index 100%
rename from src/UI/module-code-generator/src/api/components/modelProperty.js
rename to src/UI/module-codegenerator/src/api/components/modelProperty.js
diff --git a/src/UI/module-code-generator/src/api/components/module.js b/src/UI/module-codegenerator/src/api/components/module.js
similarity index 100%
rename from src/UI/module-code-generator/src/api/components/module.js
rename to src/UI/module-codegenerator/src/api/components/module.js
diff --git a/src/UI/module-codegenerator/src/api/components/onlineModule.js b/src/UI/module-codegenerator/src/api/components/onlineModule.js
new file mode 100644
index 0000000..11d5839
--- /dev/null
+++ b/src/UI/module-codegenerator/src/api/components/onlineModule.js
@@ -0,0 +1,10 @@
+import module from '../../module'
+
+export default name => {
+  const root = `${module.code}/${name}/`
+  const crud = $http.crud(root)
+
+  return {
+    ...crud
+  }
+}
diff --git a/src/UI/module-code-generator/src/api/components/property.js b/src/UI/module-codegenerator/src/api/components/property.js
similarity index 100%
rename from src/UI/module-code-generator/src/api/components/property.js
rename to src/UI/module-codegenerator/src/api/components/property.js
diff --git a/src/UI/module-code-generator/src/api/index.js b/src/UI/module-codegenerator/src/api/index.js
similarity index 100%
rename from src/UI/module-code-generator/src/api/index.js
rename to src/UI/module-codegenerator/src/api/index.js
diff --git a/src/UI/module-code-generator/src/components/index.js b/src/UI/module-codegenerator/src/components/index.js
similarity index 100%
rename from src/UI/module-code-generator/src/components/index.js
rename to src/UI/module-codegenerator/src/components/index.js
diff --git a/src/UI/module-code-generator/src/config/index.js b/src/UI/module-codegenerator/src/config/index.js
similarity index 100%
rename from src/UI/module-code-generator/src/config/index.js
rename to src/UI/module-codegenerator/src/config/index.js
diff --git a/src/UI/module-code-generator/src/index.js b/src/UI/module-codegenerator/src/index.js
similarity index 100%
rename from src/UI/module-code-generator/src/index.js
rename to src/UI/module-codegenerator/src/index.js
diff --git a/src/UI/module-code-generator/src/main.js b/src/UI/module-codegenerator/src/main.js
similarity index 100%
rename from src/UI/module-code-generator/src/main.js
rename to src/UI/module-codegenerator/src/main.js
diff --git a/src/UI/module-code-generator/src/module.js b/src/UI/module-codegenerator/src/module.js
similarity index 100%
rename from src/UI/module-code-generator/src/module.js
rename to src/UI/module-codegenerator/src/module.js
diff --git a/src/UI/module-code-generator/src/routes/index.js b/src/UI/module-codegenerator/src/routes/index.js
similarity index 100%
rename from src/UI/module-code-generator/src/routes/index.js
rename to src/UI/module-codegenerator/src/routes/index.js
diff --git a/src/UI/module-code-generator/src/store/index.js b/src/UI/module-codegenerator/src/store/index.js
similarity index 100%
rename from src/UI/module-code-generator/src/store/index.js
rename to src/UI/module-codegenerator/src/store/index.js
diff --git a/src/UI/module-code-generator/src/views/class/components/code-preview/index.vue b/src/UI/module-codegenerator/src/views/class/components/code-preview/index.vue
similarity index 100%
rename from src/UI/module-code-generator/src/views/class/components/code-preview/index.vue
rename to src/UI/module-codegenerator/src/views/class/components/code-preview/index.vue
diff --git a/src/UI/module-code-generator/src/views/class/components/save/index.vue b/src/UI/module-codegenerator/src/views/class/components/save/index.vue
similarity index 90%
rename from src/UI/module-code-generator/src/views/class/components/save/index.vue
rename to src/UI/module-codegenerator/src/views/class/components/save/index.vue
index 841221e..bddbb56 100644
--- a/src/UI/module-code-generator/src/views/class/components/save/index.vue
+++ b/src/UI/module-codegenerator/src/views/class/components/save/index.vue
@@ -9,13 +9,13 @@
           <nm-select :disabled="isEdit_" :method="getBaseEntityTypeSelect" v-model="form.model.baseEntityType" />
         </el-form-item>
         <el-form-item label="实体名称：" prop="name">
-          <el-input v-model="form.model.name" />
+          <el-input ref="name" v-model="form.model.name" clearable />
         </el-form-item>
         <el-form-item label="表名：" prop="tableName">
-          <el-input v-model="form.model.tableName" />
+          <el-input v-model="form.model.tableName" clearable />
         </el-form-item>
         <el-form-item label="备注：" prop="remarks">
-          <el-input v-model="form.model.remarks" />
+          <el-input v-model="form.model.remarks" clearable placeholder="实体对应菜单名称采用该字段" />
         </el-form-item>
         <el-form-item label="菜单图标：" prop="menuIcon">
           <nm-icon-picker v-model="form.model.menuIcon" />
@@ -85,6 +85,7 @@ export default {
     },
     onReset() {
       this.form.model.moduleId = this.module.id
+      this.$refs.name.focus()
     }
   }
 }
diff --git a/src/UI/module-code-generator/src/views/class/index/cols.js b/src/UI/module-codegenerator/src/views/class/index/cols.js
similarity index 100%
rename from src/UI/module-code-generator/src/views/class/index/cols.js
rename to src/UI/module-codegenerator/src/views/class/index/cols.js
diff --git a/src/UI/module-code-generator/src/views/class/index/index.vue b/src/UI/module-codegenerator/src/views/class/index/index.vue
similarity index 100%
rename from src/UI/module-code-generator/src/views/class/index/index.vue
rename to src/UI/module-codegenerator/src/views/class/index/index.vue
diff --git a/src/UI/module-code-generator/src/views/enum/components/save/index.vue b/src/UI/module-codegenerator/src/views/enum/components/save/index.vue
similarity index 75%
rename from src/UI/module-code-generator/src/views/enum/components/save/index.vue
rename to src/UI/module-codegenerator/src/views/enum/components/save/index.vue
index 9499ca4..0cffc7b 100644
--- a/src/UI/module-code-generator/src/views/enum/components/save/index.vue
+++ b/src/UI/module-codegenerator/src/views/enum/components/save/index.vue
@@ -3,10 +3,10 @@
     <el-row>
       <el-col :span="20" :offset="1">
         <el-form-item label="名称：" prop="name">
-          <el-input v-model="form.model.name" />
+          <el-input ref="name" v-model="form.model.name" />
         </el-form-item>
         <el-form-item label="备注：" prop="remarks">
-          <el-input v-model="form.model.remarks" />
+          <el-input v-model="form.model.remarks" clearable />
         </el-form-item>
       </el-col>
     </el-row>
@@ -21,10 +21,10 @@ export default {
   mixins: [mixins.formSave],
   data() {
     return {
-      title: '项目',
+      title: '枚举',
       actions: { add, edit, update },
       form: {
-        width: '30%',
+        width: '400px',
         labelWidth: '70px',
         model: {
           name: '',
@@ -34,8 +34,16 @@ export default {
           name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
           remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }]
         }
+      },
+      on: {
+        reset: this.onReset
       }
     }
+  },
+  methods: {
+    onReset() {
+      this.$refs.name.focus()
+    }
   }
 }
 </script>
diff --git a/src/UI/module-code-generator/src/views/enum/components/select/index.js b/src/UI/module-codegenerator/src/views/enum/components/select/index.js
similarity index 100%
rename from src/UI/module-code-generator/src/views/enum/components/select/index.js
rename to src/UI/module-codegenerator/src/views/enum/components/select/index.js
diff --git a/src/UI/module-code-generator/src/views/enum/index/cols.js b/src/UI/module-codegenerator/src/views/enum/index/cols.js
similarity index 100%
rename from src/UI/module-code-generator/src/views/enum/index/cols.js
rename to src/UI/module-codegenerator/src/views/enum/index/cols.js
diff --git a/src/UI/module-code-generator/src/views/enum/index/index.vue b/src/UI/module-codegenerator/src/views/enum/index/index.vue
similarity index 100%
rename from src/UI/module-code-generator/src/views/enum/index/index.vue
rename to src/UI/module-codegenerator/src/views/enum/index/index.vue
diff --git a/src/UI/module-code-generator/src/views/enum/index/page.js b/src/UI/module-codegenerator/src/views/enum/index/page.js
similarity index 100%
rename from src/UI/module-code-generator/src/views/enum/index/page.js
rename to src/UI/module-codegenerator/src/views/enum/index/page.js
diff --git a/src/UI/module-code-generator/src/views/enumItem/components/save/index.vue b/src/UI/module-codegenerator/src/views/enumItem/components/save/index.vue
similarity index 95%
rename from src/UI/module-code-generator/src/views/enumItem/components/save/index.vue
rename to src/UI/module-codegenerator/src/views/enumItem/components/save/index.vue
index 6c2a5a2..8971eaa 100644
--- a/src/UI/module-code-generator/src/views/enumItem/components/save/index.vue
+++ b/src/UI/module-codegenerator/src/views/enumItem/components/save/index.vue
@@ -6,7 +6,7 @@
           <el-input :value="`${parent.remarks}(${parent.name})`" disabled />
         </el-form-item>
         <el-form-item label="名称：" prop="name">
-          <el-input v-model="form.model.name" />
+          <el-input ref="name" v-model="form.model.name" />
         </el-form-item>
         <el-form-item label="值：" prop="value">
           <el-input v-model.number="form.model.value" />
@@ -59,8 +59,8 @@ export default {
   },
   methods: {
     onReset() {
-      console.log(this.parent)
       this.form.model.enumId = this.parent.id
+      this.$refs.name.focus()
     }
   }
 }
diff --git a/src/UI/module-code-generator/src/views/enumItem/index/cols.js b/src/UI/module-codegenerator/src/views/enumItem/index/cols.js
similarity index 100%
rename from src/UI/module-code-generator/src/views/enumItem/index/cols.js
rename to src/UI/module-codegenerator/src/views/enumItem/index/cols.js
diff --git a/src/UI/module-code-generator/src/views/enumItem/index/index.vue b/src/UI/module-codegenerator/src/views/enumItem/index/index.vue
similarity index 100%
rename from src/UI/module-code-generator/src/views/enumItem/index/index.vue
rename to src/UI/module-codegenerator/src/views/enumItem/index/index.vue
diff --git a/src/UI/module-code-generator/src/views/modelProperty/components/add/index.vue b/src/UI/module-codegenerator/src/views/modelProperty/components/add/index.vue
similarity index 100%
rename from src/UI/module-code-generator/src/views/modelProperty/components/add/index.vue
rename to src/UI/module-codegenerator/src/views/modelProperty/components/add/index.vue
diff --git a/src/UI/module-code-generator/src/views/modelProperty/components/edit/index.vue b/src/UI/module-codegenerator/src/views/modelProperty/components/edit/index.vue
similarity index 100%
rename from src/UI/module-code-generator/src/views/modelProperty/components/edit/index.vue
rename to src/UI/module-codegenerator/src/views/modelProperty/components/edit/index.vue
diff --git a/src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue b/src/UI/module-codegenerator/src/views/modelProperty/components/import/index.vue
similarity index 100%
rename from src/UI/module-code-generator/src/views/modelProperty/components/import/index.vue
rename to src/UI/module-codegenerator/src/views/modelProperty/components/import/index.vue
diff --git a/src/UI/module-code-generator/src/views/modelProperty/components/list/cols.js b/src/UI/module-codegenerator/src/views/modelProperty/components/list/cols.js
similarity index 100%
rename from src/UI/module-code-generator/src/views/modelProperty/components/list/cols.js
rename to src/UI/module-codegenerator/src/views/modelProperty/components/list/cols.js
diff --git a/src/UI/module-code-generator/src/views/modelProperty/components/list/index.vue b/src/UI/module-codegenerator/src/views/modelProperty/components/list/index.vue
similarity index 100%
rename from src/UI/module-code-generator/src/views/modelProperty/components/list/index.vue
rename to src/UI/module-codegenerator/src/views/modelProperty/components/list/index.vue
diff --git a/src/UI/module-code-generator/src/views/modelProperty/index/index.vue b/src/UI/module-codegenerator/src/views/modelProperty/index/index.vue
similarity index 100%
rename from src/UI/module-code-generator/src/views/modelProperty/index/index.vue
rename to src/UI/module-codegenerator/src/views/modelProperty/index/index.vue
diff --git a/src/UI/module-code-generator/src/views/module/components/save/index.vue b/src/UI/module-codegenerator/src/views/module/components/save/index.vue
similarity index 64%
rename from src/UI/module-code-generator/src/views/module/components/save/index.vue
rename to src/UI/module-codegenerator/src/views/module/components/save/index.vue
index 502dfa7..9f566d2 100644
--- a/src/UI/module-code-generator/src/views/module/components/save/index.vue
+++ b/src/UI/module-codegenerator/src/views/module/components/save/index.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="20" :offset="1">
         <el-form-item label="名称：" prop="name">
-          <el-input autofocus v-model="form.model.name" />
+          <el-input ref="name" v-model="form.model.name" />
         </el-form-item>
         <el-form-item label="编号：" prop="no">
           <el-input v-model.number="form.model.no" />
@@ -16,7 +16,16 @@
           <nm-icon-picker v-model="form.model.icon" />
         </el-form-item>
         <el-form-item label="版权声明：" prop="copyright">
-          <el-input v-model="form.model.copyright" />
+          <el-input v-model="form.model.copyright" clearable />
+        </el-form-item>
+        <el-form-item label="公司名称：" prop="company">
+          <el-input v-model="form.model.company" clearable />
+        </el-form-item>
+        <el-form-item label="项目地址：" prop="projectUrl">
+          <el-input v-model="form.model.projectUrl" clearable />
+        </el-form-item>
+        <el-form-item label="仓库地址：" prop="repositoryUrl">
+          <el-input v-model="form.model.repositoryUrl" clearable />
         </el-form-item>
       </el-col>
     </el-row>
@@ -41,7 +50,10 @@ export default {
           no: 0,
           code: '',
           icon: '',
-          copyright: ''
+          copyright: '',
+          company: '',
+          projectUrl: '',
+          repositoryUrl: ''
         },
         rules: {
           name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
@@ -51,10 +63,20 @@ export default {
             { type: 'number', min: 0, max: 59315, message: '编码在 0 到 59315 之间', trigger: 'blur' }
           ],
           icon: [{ required: true, message: '请选择图标', trigger: 'blur' }],
-          copyright: [{ required: true, message: '请输入版权声明', trigger: 'blur' }]
+          copyright: [{ required: true, message: '请输入版权声明', trigger: 'blur' }],
+          projectUrl: [{ type: 'url', message: '请输入有效的URL', trigger: 'blur' }],
+          repositoryUrl: [{ type: 'url', message: '请输入有效的URL', trigger: 'blur' }]
         }
+      },
+      on: {
+        reset: this.onReset
       }
     }
+  },
+  methods: {
+    onReset() {
+      this.$refs.name.focus()
+    }
   }
 }
 </script>
diff --git a/src/UI/module-code-generator/src/views/module/components/select/index.vue b/src/UI/module-codegenerator/src/views/module/components/select/index.vue
similarity index 100%
rename from src/UI/module-code-generator/src/views/module/components/select/index.vue
rename to src/UI/module-codegenerator/src/views/module/components/select/index.vue
diff --git a/src/UI/module-code-generator/src/views/module/index/cols.js b/src/UI/module-codegenerator/src/views/module/index/cols.js
similarity index 74%
rename from src/UI/module-code-generator/src/views/module/index/cols.js
rename to src/UI/module-codegenerator/src/views/module/index/cols.js
index 588f282..7c8eee9 100644
--- a/src/UI/module-code-generator/src/views/module/index/cols.js
+++ b/src/UI/module-codegenerator/src/views/module/index/cols.js
@@ -25,6 +25,18 @@ export default [
     name: 'copyright',
     label: '版权声明'
   },
+  {
+    name: 'company',
+    label: '公司名称'
+  },
+  {
+    name: 'projectUrl',
+    label: '官方地址'
+  },
+  {
+    name: 'repositoryUrl',
+    label: '仓库地址'
+  },
   {
     name: 'creator',
     label: '创建人',
diff --git a/src/UI/module-code-generator/src/views/module/index/index.vue b/src/UI/module-codegenerator/src/views/module/index/index.vue
similarity index 61%
rename from src/UI/module-code-generator/src/views/module/index/index.vue
rename to src/UI/module-codegenerator/src/views/module/index/index.vue
index f9ec62e..cdb871e 100644
--- a/src/UI/module-code-generator/src/views/module/index/index.vue
+++ b/src/UI/module-codegenerator/src/views/module/index/index.vue
@@ -20,15 +20,36 @@
       <template v-slot:col-isShow="{ row }">{{ row.isShow ? '是' : '否' }}</template>
 
       <template v-slot:col-icon="{ row }">
-        <nm-icon :name="row.icon" />
+        <nm-icon :name="row.icon" class="nm-size-20" />
+      </template>
+
+      <template v-slot:col-projectUrl="{ row }">
+        <el-link v-if="row.projectUrl" type="primary" :href="row.projectUrl" target="_blank">{{ row.projectUrl }}</el-link>
+      </template>
+
+      <template v-slot:col-repositoryUrl="{ row }">
+        <el-link v-if="row.repositoryUrl" type="primary" :href="row.repositoryUrl" target="_blank">{{ row.repositoryUrl }}</el-link>
       </template>
 
       <!--操作列-->
       <template v-slot:col-operation="{ row }">
-        <nm-button v-bind="buttons.classManage" @click="manageClass(row)" />
-        <nm-button v-bind="buttons.buildCode" @click="buildCode(row)" />
-        <nm-button v-bind="buttons.edit" @click="edit(row)" />
-        <nm-button-delete v-bind="buttons.del" :action="removeAction" :id="row.id" @success="refresh" />
+        <el-dropdown>
+          <span class="el-dropdown-link"> 操作<i class="el-icon-arrow-down el-icon--right"></i> </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item>
+              <nm-button v-bind="buttons.classManage" @click="manageClass(row)" />
+            </el-dropdown-item>
+            <el-dropdown-item>
+              <nm-button v-bind="buttons.buildCode" @click="buildCode(row)" />
+            </el-dropdown-item>
+            <el-dropdown-item>
+              <nm-button v-bind="buttons.edit" @click="edit(row)" />
+            </el-dropdown-item>
+            <el-dropdown-item>
+              <nm-button-delete v-bind="buttons.del" :action="removeAction" :id="row.id" @success="refresh" />
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
       </template>
     </nm-list>
 
diff --git a/src/UI/module-code-generator/src/views/module/index/page.js b/src/UI/module-codegenerator/src/views/module/index/page.js
similarity index 100%
rename from src/UI/module-code-generator/src/views/module/index/page.js
rename to src/UI/module-codegenerator/src/views/module/index/page.js
diff --git a/src/UI/module-codegenerator/src/views/onlineModule/components/save/index.vue b/src/UI/module-codegenerator/src/views/onlineModule/components/save/index.vue
new file mode 100644
index 0000000..f630de7
--- /dev/null
+++ b/src/UI/module-codegenerator/src/views/onlineModule/components/save/index.vue
@@ -0,0 +1,73 @@
+<template>
+  <nm-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
+    <el-row>
+      <el-col :span="20" :offset="1">
+        <el-form-item label="名称：" prop="name">
+          <el-input v-model="form.model.name" clearable />
+        </el-form-item>
+        <el-form-item label="编码：" prop="code">
+          <el-input v-model="form.model.code" clearable />
+        </el-form-item>
+        <el-form-item label="图标：" prop="icon">
+          <el-input v-model="form.model.icon" clearable />
+        </el-form-item>
+        <el-form-item label="介绍说明：" prop="description">
+          <el-input v-model="form.model.description" clearable />
+        </el-form-item>
+        <el-form-item label="NuGet包ID：" prop="nuGetId">
+          <el-input v-model="form.model.nuGetId" clearable />
+        </el-form-item>
+        <el-form-item label="NPM包ID：" prop="npmId">
+          <el-input v-model="form.model.npmId" clearable />
+        </el-form-item>
+        <el-form-item label="公司名称：" prop="company">
+          <el-input v-model="form.model.company" clearable />
+        </el-form-item>
+        <el-form-item label="项目地址：" prop="projectUrl">
+          <el-input v-model="form.model.projectUrl" clearable />
+        </el-form-item>
+        <el-form-item label="仓库地址：" prop="repositoryUrl">
+          <el-input v-model="form.model.repositoryUrl" clearable />
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </nm-form-dialog>
+</template>
+<script>
+import { mixins } from 'netmodular-ui'
+
+const { add, edit, update } = $api.codeGenerator.onlineModule
+
+export default {
+  mixins: [mixins.formSave],
+  data() {
+    return {
+      title: '在线模块',
+      actions: { add, edit, update },
+      form: {
+        model: {
+          /** 名称 */
+          name: '',
+          /** 编码 */
+          code: '',
+          /** 图标 */
+          icon: '',
+          /** 介绍说明 */
+          description: '',
+          /** NuGet包ID */
+          nuGetId: '',
+          /** NPM包ID */
+          npmId: '',
+          /** 公司名称 */
+          company: '',
+          /** 项目地址 */
+          projectUrl: '',
+          /** 仓库地址 */
+          repositoryUrl: ''
+        },
+        rules: {}
+      }
+    }
+  }
+}
+</script>
diff --git a/src/UI/module-codegenerator/src/views/onlineModule/index/cols.js b/src/UI/module-codegenerator/src/views/onlineModule/index/cols.js
new file mode 100644
index 0000000..0628b1f
--- /dev/null
+++ b/src/UI/module-codegenerator/src/views/onlineModule/index/cols.js
@@ -0,0 +1,44 @@
+export default [
+  {
+    name: 'id',
+    label: '编号',
+    width: 250,
+    show: false
+  },
+  {
+    name: 'name',
+    label: '名称'
+  },
+  {
+    name: 'code',
+    label: '编码'
+  },
+  {
+    name: 'icon',
+    label: '图标'
+  },
+  {
+    name: 'description',
+    label: '介绍说明'
+  },
+  {
+    name: 'nuGetId',
+    label: 'NuGet包ID'
+  },
+  {
+    name: 'npmId',
+    label: 'NPM包ID'
+  },
+  {
+    name: 'company',
+    label: '公司名称'
+  },
+  {
+    name: 'projectUrl',
+    label: '项目地址'
+  },
+  {
+    name: 'repositoryUrl',
+    label: '仓库地址'
+  }
+]
diff --git a/src/UI/module-codegenerator/src/views/onlineModule/index/index.vue b/src/UI/module-codegenerator/src/views/onlineModule/index/index.vue
new file mode 100644
index 0000000..c8eec2d
--- /dev/null
+++ b/src/UI/module-codegenerator/src/views/onlineModule/index/index.vue
@@ -0,0 +1,99 @@
+<template>
+  <nm-container>
+    <nm-list ref="list" v-bind="list">
+      <!--查询条件-->
+      <template v-slot:querybar>
+        <el-form-item label="名称：" prop="name">
+          <el-input v-model="list.model.name" clearable />
+        </el-form-item>
+        <el-form-item label="编码：" prop="code">
+          <el-input v-model="list.model.code" clearable />
+        </el-form-item>
+        <el-form-item label="图标：" prop="icon">
+          <el-input v-model="list.model.icon" clearable />
+        </el-form-item>
+        <el-form-item label="介绍说明：" prop="description">
+          <el-input v-model="list.model.description" clearable />
+        </el-form-item>
+        <el-form-item label="NuGet包ID：" prop="nuGetId">
+          <el-input v-model="list.model.nuGetId" clearable />
+        </el-form-item>
+        <el-form-item label="NPM包ID：" prop="npmId">
+          <el-input v-model="list.model.npmId" clearable />
+        </el-form-item>
+        <el-form-item label="公司名称：" prop="company">
+          <el-input v-model="list.model.company" clearable />
+        </el-form-item>
+        <el-form-item label="项目地址：" prop="projectUrl">
+          <el-input v-model="list.model.projectUrl" clearable />
+        </el-form-item>
+        <el-form-item label="仓库地址：" prop="repositoryUrl">
+          <el-input v-model="list.model.repositoryUrl" clearable />
+        </el-form-item>
+      </template>
+
+      <!--按钮-->
+      <template v-slot:querybar-buttons>
+        <nm-button-has :options="buttons.add" @click="add" />
+      </template>
+
+      <!--自定义列-->
+      <!-- <template v-slot:col-name="{row}">
+        <nm-button :text="row.name" type="text" />
+      </template> -->
+
+      <!--操作列-->
+      <template v-slot:col-operation="{ row }">
+        <nm-button v-bind="buttons.edit" @click="edit(row)" />
+        <nm-button-delete v-bind="buttons.del" :id="row.id" :action="removeAction" @success="refresh" />
+      </template>
+    </nm-list>
+
+    <save-page :id="curr.id" :visible.sync="dialog.save" @success="refresh" />
+  </nm-container>
+</template>
+<script>
+import { mixins } from 'netmodular-ui'
+import page from './page'
+import cols from './cols'
+import SavePage from '../components/save'
+
+const api = $api.codeGenerator.onlineModule
+
+export default {
+  name: page.name,
+  mixins: [mixins.list],
+  components: { SavePage },
+  data() {
+    return {
+      list: {
+        title: page.title,
+        cols,
+        action: api.query,
+        model: {
+          /** 名称 */
+          name: '',
+          /** 编码 */
+          code: '',
+          /** 图标 */
+          icon: '',
+          /** 介绍说明 */
+          description: '',
+          /** NuGet包ID */
+          nuGetId: '',
+          /** NPM包ID */
+          npmId: '',
+          /** 公司名称 */
+          company: '',
+          /** 项目地址 */
+          projectUrl: '',
+          /** 仓库地址 */
+          repositoryUrl: ''
+        }
+      },
+      removeAction: api.remove,
+      buttons: page.buttons
+    }
+  }
+}
+</script>
diff --git a/src/UI/module-codegenerator/src/views/onlineModule/index/page.js b/src/UI/module-codegenerator/src/views/onlineModule/index/page.js
new file mode 100644
index 0000000..c18ed1a
--- /dev/null
+++ b/src/UI/module-codegenerator/src/views/onlineModule/index/page.js
@@ -0,0 +1,43 @@
+/** 页面信息 */
+const page = new (function() {
+  this.title = '在线模块'
+  this.icon = 'app'
+  this.name = 'codegenerator_onlinemodule'
+  this.path = '/codegenerator/onlinemodule'
+
+  // 关联权限
+  this.permissions = [`${this.name}_query_get`]
+
+  // 按钮
+  this.buttons = {
+    add: {
+      text: '添加',
+      type: 'success',
+      icon: 'add',
+      code: `${this.name}_add`,
+      permissions: [`${this.name}_add_post`]
+    },
+    edit: {
+      text: '编辑',
+      type: 'text',
+      icon: 'edit',
+      code: `${this.name}_edit`,
+      permissions: [`${this.name}_edit_get`, `${this.name}_update_post`]
+    },
+    del: {
+      text: '删除',
+      type: 'text',
+      icon: 'delete',
+      code: `${this.name}_del`,
+      permissions: [`${this.name}_delete_delete`]
+    }
+  }
+})()
+
+/** 路由信息 */
+export const route = {
+  page,
+  component: () => import(/* webpackChunkName: "CodeGenerator.OnlineModule" */ './index')
+}
+
+export default page
diff --git a/src/UI/module-code-generator/src/views/property/components/add/index.vue b/src/UI/module-codegenerator/src/views/property/components/save/index.vue
similarity index 91%
rename from src/UI/module-code-generator/src/views/property/components/add/index.vue
rename to src/UI/module-codegenerator/src/views/property/components/save/index.vue
index a7be1ed..87d67b2 100644
--- a/src/UI/module-code-generator/src/views/property/components/add/index.vue
+++ b/src/UI/module-codegenerator/src/views/property/components/save/index.vue
@@ -2,11 +2,11 @@
   <nm-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
     <el-row>
       <el-col :span="20" :offset="1">
-        <el-form-item label="所属类：">
-          <el-input v-model="parent.name" disabled />
+        <el-form-item label="所属实体：">
+          <el-input :value="`${parent.remarks}(${parent.name})`" disabled />
         </el-form-item>
         <el-form-item label="名称：" prop="name">
-          <el-input v-model="form.model.name" />
+          <el-input ref="name" v-model="form.model.name" />
         </el-form-item>
         <el-form-item label="类型：" prop="type">
           <type-select v-model="form.model.type" />
@@ -59,11 +59,11 @@ import { mixins } from 'netmodular-ui'
 import TypeSelect from '../type-select'
 import EnumSelect from '../../../enum/components/select'
 
-const api = $api.codeGenerator.property
+const { add, edit, update } = $api.codeGenerator.property
 const enumApi = $api.codeGenerator.enum
 
 export default {
-  mixins: [mixins.visible],
+  mixins: [mixins.formSave],
   components: { TypeSelect, EnumSelect },
   data() {
     // 验证字符串长度
@@ -82,6 +82,7 @@ export default {
         callback()
       }
     }
+
     // 验证精度
     const validatePrecision = (rule, value, callback) => {
       if (this.showPrecision) {
@@ -98,6 +99,7 @@ export default {
         callback()
       }
     }
+
     // 验证刻度
     const validateScale = (rule, value, callback) => {
       if (this.showScale) {
@@ -116,6 +118,7 @@ export default {
         callback()
       }
     }
+
     // 验证枚举
     const validateEnum = (rule, value, callback) => {
       if (this.showEnum && value === '') {
@@ -124,17 +127,21 @@ export default {
         callback()
       }
     }
+
     return {
+      title: '属性',
+      actions: {
+        add,
+        edit,
+        update
+      },
       form: {
-        title: '添加属性',
-        icon: 'add',
         width: '40%',
-        action: api.add,
         model: {
           classId: 0,
           name: '',
           type: 0,
-          length: 0,
+          length: 50,
           precision: 0,
           scale: 0,
           enumId: '',
@@ -160,7 +167,8 @@ export default {
       },
       on: {
         success: this.onSuccess,
-        open: this.onOpen
+        open: this.onOpen,
+        reset: this.onReset
       }
     }
   },
@@ -189,15 +197,10 @@ export default {
     getEnumSelect() {
       return enumApi.select()
     },
-    onSuccess() {
-      this.$emit('success')
-    },
-    onOpen() {
-      this.$nextTick(() => {
-        this.$refs.form.reset()
-        this.form.model.classId = this.parent.id
-        this.form.model.sort = this.total
-      })
+    onReset() {
+      this.form.model.classId = this.parent.id
+      this.form.model.sort = this.total
+      this.$refs.name.focus()
     }
   },
   watch: {
diff --git a/src/UI/module-code-generator/src/views/property/components/type-select/index.js b/src/UI/module-codegenerator/src/views/property/components/type-select/index.js
similarity index 100%
rename from src/UI/module-code-generator/src/views/property/components/type-select/index.js
rename to src/UI/module-codegenerator/src/views/property/components/type-select/index.js
diff --git a/src/UI/module-code-generator/src/views/property/index/cols.js b/src/UI/module-codegenerator/src/views/property/index/cols.js
similarity index 100%
rename from src/UI/module-code-generator/src/views/property/index/cols.js
rename to src/UI/module-codegenerator/src/views/property/index/cols.js
diff --git a/src/UI/module-code-generator/src/views/property/index/index.vue b/src/UI/module-codegenerator/src/views/property/index/index.vue
similarity index 90%
rename from src/UI/module-code-generator/src/views/property/index/index.vue
rename to src/UI/module-codegenerator/src/views/property/index/index.vue
index 8528a29..28786d2 100644
--- a/src/UI/module-code-generator/src/views/property/index/index.vue
+++ b/src/UI/module-codegenerator/src/views/property/index/index.vue
@@ -36,22 +36,20 @@
       </template>
     </nm-list>
 
-    <add-page :total="total" :parent="parent" :visible.sync="dialog.add" @success="refresh" />
-    <edit-page :id="curr.id" :parent="parent" :visible.sync="dialog.edit" @success="refresh" />
+    <save-page :total="total" :parent="parent" :id="curr.id" :visible.sync="dialog.save" @success="refresh" />
     <nm-drag-sort-dialog v-bind="dragSort" :visible.sync="dialog.sort" @success="refresh" />
   </nm-list-dialog>
 </template>
 <script>
 import { mixins } from 'netmodular-ui'
 import cols from './cols'
-import AddPage from '../components/add'
-import EditPage from '../components/edit'
+import SavePage from '../components/save'
 
 const api = $api.codeGenerator.property
 
 export default {
   mixins: [mixins.visible],
-  components: { AddPage, EditPage },
+  components: { SavePage },
   data() {
     return {
       curr: { id: '' },
@@ -68,8 +66,7 @@ export default {
         cols
       },
       dialog: {
-        add: false,
-        edit: false,
+        save: false,
         property: false,
         sort: false
       },
@@ -96,11 +93,11 @@ export default {
     },
     add(total) {
       this.total = total
-      this.dialog.add = true
+      this.dialog.save = true
     },
     edit(row) {
       this.curr = row
-      this.dialog.edit = true
+      this.dialog.save = true
     },
     updateNullable(row) {
       row.nullable = !row.nullable
diff --git a/src/UI/module-code-generator/vue.config.js b/src/UI/module-codegenerator/vue.config.js
similarity index 100%
rename from src/UI/module-code-generator/vue.config.js
rename to src/UI/module-codegenerator/vue.config.js
diff --git a/src/Web/Controllers/OnlineModuleController.cs b/src/Web/Controllers/OnlineModuleController.cs
new file mode 100644
index 0000000..69f38fc
--- /dev/null
+++ b/src/Web/Controllers/OnlineModuleController.cs
@@ -0,0 +1,58 @@
+using System;
+using System.ComponentModel;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using NetModular.Lib.Utils.Core.Result;
+using NetModular.Module.CodeGenerator.Application.OnlineModuleService;
+using NetModular.Module.CodeGenerator.Application.OnlineModuleService.ViewModels;
+using NetModular.Module.CodeGenerator.Domain.OnlineModule.Models;
+
+namespace NetModular.Module.CodeGenerator.Web.Controllers
+{
+    [Description("在线模块管理")]
+    public class OnlineModuleController : Web.ModuleController
+    {
+        private readonly IOnlineModuleService _service;
+
+        public OnlineModuleController(IOnlineModuleService service)
+        {
+            _service = service;
+        }
+
+        [HttpGet]
+        [Description("查询")]
+        public Task<IResultModel> Query([FromQuery]OnlineModuleQueryModel model)
+        {
+            return _service.Query(model);
+        }
+
+        [HttpPost]
+        [Description("添加")]
+        public Task<IResultModel> Add(OnlineModuleAddModel model)
+        {
+            return _service.Add(model);
+        }
+
+        [HttpDelete]
+        [Description("删除")]
+        public Task<IResultModel> Delete([BindRequired]Guid id)
+        {
+            return _service.Delete(id);
+        }
+
+        [HttpGet]
+        [Description("编辑")]
+        public Task<IResultModel> Edit([BindRequired]Guid id)
+        {
+            return _service.Edit(id);
+        }
+
+        [HttpPost]
+        [Description("修改")]
+        public Task<IResultModel> Update(OnlineModuleUpdateModel model)
+        {
+            return _service.Update(model);
+        }
+    }
+}
diff --git a/src/Web/ModuleInitializer.cs b/src/Web/ModuleInitializer.cs
index 32a56c5..efd3cba 100644
--- a/src/Web/ModuleInitializer.cs
+++ b/src/Web/ModuleInitializer.cs
@@ -17,7 +17,6 @@ public class ModuleInitializer : IModuleInitializer
         /// <param name="env"></param>
         public void ConfigureServices(IServiceCollection services, IModuleCollection modules, IHostEnvironment env)
         {
-            
         }
 
         /// <summary>
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index 137e03c..0151233 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.3"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.4"}

From cbf1f477de7a72572ac75461e889878e05a9d590 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Wed, 4 Mar 2020 12:48:08 +0800
Subject: [PATCH 28/71] update

---
 .gitignore                                    |     1 +
 src/UI/module-codegenerator/package-lock.json | 12129 ----------------
 2 files changed, 1 insertion(+), 12129 deletions(-)
 delete mode 100644 src/UI/module-codegenerator/package-lock.json

diff --git a/.gitignore b/.gitignore
index 17b904c..ec12543 100644
--- a/.gitignore
+++ b/.gitignore
@@ -339,3 +339,4 @@ ASALocalRun/
 /src/UI/module-common/package-lock.json
 /src/WebHost/wwwroot
 /src/UI/module-code-generator/package-lock.json
+/src/UI/module-codegenerator/package-lock.json
diff --git a/src/UI/module-codegenerator/package-lock.json b/src/UI/module-codegenerator/package-lock.json
deleted file mode 100644
index 3c17e3a..0000000
--- a/src/UI/module-codegenerator/package-lock.json
+++ /dev/null
@@ -1,12129 +0,0 @@
-{
-  "name": "netmodular-module-code-generator",
-  "version": "1.1.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.5.5.tgz",
-      "integrity": "sha1-vAeC9tafe31JUxIZaZuYj2aaj50=",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.0.0"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.6.tgz",
-      "integrity": "sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.8.5",
-        "invariant": "^2.2.4",
-        "semver": "^5.5.0"
-      }
-    },
-    "@babel/core": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.6.tgz",
-      "integrity": "sha512-Sheg7yEJD51YHAvLEV/7Uvw95AeWqYPL3Vk3zGujJKIhJ+8oLw2ALaf3hbucILhKsgSoADOvtKRJuNVdcJkOrg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.8.6",
-        "@babel/helpers": "^7.8.4",
-        "@babel/parser": "^7.8.6",
-        "@babel/template": "^7.8.6",
-        "@babel/traverse": "^7.8.6",
-        "@babel/types": "^7.8.6",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.1",
-        "json5": "^2.1.0",
-        "lodash": "^4.17.13",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
-        "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.8.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
-          "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.0.0",
-            "esutils": "^2.0.2",
-            "js-tokens": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@babel/generator": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.6.tgz",
-      "integrity": "sha512-4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.8.6",
-        "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
-        "source-map": "^0.5.0"
-      }
-    },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz",
-      "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz",
-      "integrity": "sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-call-delegate": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz",
-      "integrity": "sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.8.3",
-        "@babel/traverse": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.6.tgz",
-      "integrity": "sha512-UrJdk27hKVJSnibFcUWYLkCL0ZywTUoot8yii1lsHJcvwrypagmYKjHLMWivQPm4s6GdyygCL8fiH5EYLxhQwQ==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.8.6",
-        "browserslist": "^4.8.5",
-        "invariant": "^2.2.4",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
-      }
-    },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz",
-      "integrity": "sha512-klTBDdsr+VFFqaDHm5rR69OpEQtO2Qv8ECxHS1mNhJJvaHArR6a1xTf5K/eZW7eZpJbhCx3NW1Yt/sKsLXLblg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.8.3",
-        "@babel/helper-member-expression-to-functions": "^7.8.3",
-        "@babel/helper-optimise-call-expression": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-replace-supers": "^7.8.6",
-        "@babel/helper-split-export-declaration": "^7.8.3"
-      }
-    },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.6.tgz",
-      "integrity": "sha512-bPyujWfsHhV/ztUkwGHz/RPV1T1TDEsSZDsN42JPehndA+p1KKTh3npvTadux0ZhCrytx9tvjpWNowKby3tM6A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.8.3",
-        "@babel/helper-regex": "^7.8.3",
-        "regexpu-core": "^4.6.0"
-      }
-    },
-    "@babel/helper-define-map": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz",
-      "integrity": "sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.8.3",
-        "@babel/types": "^7.8.3",
-        "lodash": "^4.17.13"
-      }
-    },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz",
-      "integrity": "sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==",
-      "dev": true,
-      "requires": {
-        "@babel/traverse": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-function-name": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz",
-      "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.8.3",
-        "@babel/template": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-get-function-arity": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-      "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz",
-      "integrity": "sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
-      "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
-      "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz",
-      "integrity": "sha512-RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-replace-supers": "^7.8.6",
-        "@babel/helper-simple-access": "^7.8.3",
-        "@babel/helper-split-export-declaration": "^7.8.3",
-        "@babel/template": "^7.8.6",
-        "@babel/types": "^7.8.6",
-        "lodash": "^4.17.13"
-      }
-    },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
-      "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-      "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-      "dev": true
-    },
-    "@babel/helper-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz",
-      "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.13"
-      }
-    },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz",
-      "integrity": "sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.8.3",
-        "@babel/helper-wrap-function": "^7.8.3",
-        "@babel/template": "^7.8.3",
-        "@babel/traverse": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-replace-supers": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
-      "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.8.3",
-        "@babel/helper-optimise-call-expression": "^7.8.3",
-        "@babel/traverse": "^7.8.6",
-        "@babel/types": "^7.8.6"
-      }
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz",
-      "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-      "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helper-wrap-function": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz",
-      "integrity": "sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.8.3",
-        "@babel/template": "^7.8.3",
-        "@babel/traverse": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/helpers": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz",
-      "integrity": "sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.8.3",
-        "@babel/traverse": "^7.8.4",
-        "@babel/types": "^7.8.3"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npm.taobao.org/@babel/highlight/download/@babel/highlight-7.5.0.tgz",
-      "integrity": "sha1-VtETEr2SSPphlZHQJHK+boyzJUA=",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "@babel/parser": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.6.tgz",
-      "integrity": "sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g==",
-      "dev": true
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz",
-      "integrity": "sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-remap-async-to-generator": "^7.8.3",
-        "@babel/plugin-syntax-async-generators": "^7.8.0"
-      }
-    },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz",
-      "integrity": "sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-decorators": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz",
-      "integrity": "sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-decorators": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
-      }
-    },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz",
-      "integrity": "sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.0"
-      }
-    },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
-      }
-    },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0"
-      }
-    },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
-      }
-    },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
-      }
-    },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz",
-      "integrity": "sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-decorators": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz",
-      "integrity": "sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-jsx": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz",
-      "integrity": "sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-top-level-await": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz",
-      "integrity": "sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-arrow-functions": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz",
-      "integrity": "sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-async-to-generator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz",
-      "integrity": "sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-remap-async-to-generator": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz",
-      "integrity": "sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-block-scoping": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz",
-      "integrity": "sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "lodash": "^4.17.13"
-      }
-    },
-    "@babel/plugin-transform-classes": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz",
-      "integrity": "sha512-k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.8.3",
-        "@babel/helper-define-map": "^7.8.3",
-        "@babel/helper-function-name": "^7.8.3",
-        "@babel/helper-optimise-call-expression": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-replace-supers": "^7.8.6",
-        "@babel/helper-split-export-declaration": "^7.8.3",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/plugin-transform-computed-properties": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz",
-      "integrity": "sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-destructuring": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz",
-      "integrity": "sha512-H4X646nCkiEcHZUZaRkhE2XVsoz0J/1x3VVujnn96pSoGCtKPA99ZZA+va+gK+92Zycd6OBKCD8tDb/731bhgQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-dotall-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz",
-      "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz",
-      "integrity": "sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz",
-      "integrity": "sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-for-of": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz",
-      "integrity": "sha512-M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-function-name": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz",
-      "integrity": "sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-literals": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz",
-      "integrity": "sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz",
-      "integrity": "sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-modules-amd": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz",
-      "integrity": "sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
-      }
-    },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz",
-      "integrity": "sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-simple-access": "^7.8.3",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
-      }
-    },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz",
-      "integrity": "sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.8.3",
-        "@babel/helper-module-transforms": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
-      }
-    },
-    "@babel/plugin-transform-modules-umd": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz",
-      "integrity": "sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz",
-      "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz",
-      "integrity": "sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz",
-      "integrity": "sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-replace-supers": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz",
-      "integrity": "sha512-IsS3oTxeTsZlE5KqzTbcC2sV0P9pXdec53SU+Yxv7o/6dvGM5AkTotQKhoSffhNgZ/dftsSiOoxy7evCYJXzVA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-call-delegate": "^7.8.3",
-        "@babel/helper-get-function-arity": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz",
-      "integrity": "sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz",
-      "integrity": "sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA==",
-      "dev": true,
-      "requires": {
-        "regenerator-transform": "^0.14.0"
-      }
-    },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz",
-      "integrity": "sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-runtime": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz",
-      "integrity": "sha512-/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "resolve": "^1.8.1",
-        "semver": "^5.5.1"
-      }
-    },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz",
-      "integrity": "sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz",
-      "integrity": "sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz",
-      "integrity": "sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-regex": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz",
-      "integrity": "sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz",
-      "integrity": "sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-transform-unicode-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz",
-      "integrity": "sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/polyfill": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.8.3.tgz",
-      "integrity": "sha512-0QEgn2zkCzqGIkSWWAEmvxD7e00Nm9asTtQvi7HdlYvMhjy/J38V/1Y9ode0zEJeIuxAI0uftiAzqc7nVeWUGg==",
-      "requires": {
-        "core-js": "^2.6.5",
-        "regenerator-runtime": "^0.13.2"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.11",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
-        }
-      }
-    },
-    "@babel/preset-env": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.6.tgz",
-      "integrity": "sha512-M5u8llV9DIVXBFB/ArIpqJuvXpO+ymxcJ6e8ZAmzeK3sQeBNOD1y+rHvHCGG4TlEmsNpIrdecsHGHT8ZCoOSJg==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.8.6",
-        "@babel/helper-compilation-targets": "^7.8.6",
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
-        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
-        "@babel/plugin-proposal-json-strings": "^7.8.3",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-proposal-object-rest-spread": "^7.8.3",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-proposal-optional-chaining": "^7.8.3",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
-        "@babel/plugin-syntax-async-generators": "^7.8.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
-        "@babel/plugin-syntax-json-strings": "^7.8.0",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3",
-        "@babel/plugin-transform-arrow-functions": "^7.8.3",
-        "@babel/plugin-transform-async-to-generator": "^7.8.3",
-        "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
-        "@babel/plugin-transform-block-scoping": "^7.8.3",
-        "@babel/plugin-transform-classes": "^7.8.6",
-        "@babel/plugin-transform-computed-properties": "^7.8.3",
-        "@babel/plugin-transform-destructuring": "^7.8.3",
-        "@babel/plugin-transform-dotall-regex": "^7.8.3",
-        "@babel/plugin-transform-duplicate-keys": "^7.8.3",
-        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
-        "@babel/plugin-transform-for-of": "^7.8.6",
-        "@babel/plugin-transform-function-name": "^7.8.3",
-        "@babel/plugin-transform-literals": "^7.8.3",
-        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
-        "@babel/plugin-transform-modules-amd": "^7.8.3",
-        "@babel/plugin-transform-modules-commonjs": "^7.8.3",
-        "@babel/plugin-transform-modules-systemjs": "^7.8.3",
-        "@babel/plugin-transform-modules-umd": "^7.8.3",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
-        "@babel/plugin-transform-new-target": "^7.8.3",
-        "@babel/plugin-transform-object-super": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.8.4",
-        "@babel/plugin-transform-property-literals": "^7.8.3",
-        "@babel/plugin-transform-regenerator": "^7.8.3",
-        "@babel/plugin-transform-reserved-words": "^7.8.3",
-        "@babel/plugin-transform-shorthand-properties": "^7.8.3",
-        "@babel/plugin-transform-spread": "^7.8.3",
-        "@babel/plugin-transform-sticky-regex": "^7.8.3",
-        "@babel/plugin-transform-template-literals": "^7.8.3",
-        "@babel/plugin-transform-typeof-symbol": "^7.8.4",
-        "@babel/plugin-transform-unicode-regex": "^7.8.3",
-        "@babel/types": "^7.8.6",
-        "browserslist": "^4.8.5",
-        "core-js-compat": "^3.6.2",
-        "invariant": "^2.2.2",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
-      }
-    },
-    "@babel/runtime": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz",
-      "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==",
-      "dev": true,
-      "requires": {
-        "regenerator-runtime": "^0.13.2"
-      }
-    },
-    "@babel/template": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/parser": "^7.8.6",
-        "@babel/types": "^7.8.6"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.8.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
-          "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.0.0",
-            "esutils": "^2.0.2",
-            "js-tokens": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz",
-      "integrity": "sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.8.6",
-        "@babel/helper-function-name": "^7.8.3",
-        "@babel/helper-split-export-declaration": "^7.8.3",
-        "@babel/parser": "^7.8.6",
-        "@babel/types": "^7.8.6",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.8.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
-          "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.0.0",
-            "esutils": "^2.0.2",
-            "js-tokens": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@babel/types": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz",
-      "integrity": "sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.13",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@hapi/address": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
-      "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==",
-      "dev": true
-    },
-    "@hapi/bourne": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz",
-      "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==",
-      "dev": true
-    },
-    "@hapi/hoek": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
-      "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==",
-      "dev": true
-    },
-    "@hapi/joi": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz",
-      "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
-      "dev": true,
-      "requires": {
-        "@hapi/address": "2.x.x",
-        "@hapi/bourne": "1.x.x",
-        "@hapi/hoek": "8.x.x",
-        "@hapi/topo": "3.x.x"
-      }
-    },
-    "@hapi/topo": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz",
-      "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==",
-      "dev": true,
-      "requires": {
-        "@hapi/hoek": "^8.3.0"
-      }
-    },
-    "@intervolga/optimize-cssnano-plugin": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz",
-      "integrity": "sha512-zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA==",
-      "dev": true,
-      "requires": {
-        "cssnano": "^4.0.0",
-        "cssnano-preset-default": "^4.0.0",
-        "postcss": "^7.0.0"
-      }
-    },
-    "@mrmlnc/readdir-enhanced": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-      "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
-      "dev": true,
-      "requires": {
-        "call-me-maybe": "^1.0.1",
-        "glob-to-regexp": "^0.3.0"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-      "dev": true
-    },
-    "@soda/friendly-errors-webpack-plugin": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz",
-      "integrity": "sha512-cWKrGaFX+rfbMrAxVv56DzhPNqOJPZuNIS2HGMELtgGzb+vsMzyig9mml5gZ/hr2BGtSLV+dP2LUEuAL8aG2mQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "error-stack-parser": "^2.0.0",
-        "string-width": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
-    },
-    "@types/events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
-      "dev": true
-    },
-    "@types/glob": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
-      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
-      "dev": true,
-      "requires": {
-        "@types/events": "*",
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/minimatch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "13.7.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.7.tgz",
-      "integrity": "sha512-Uo4chgKbnPNlxQwoFmYIwctkQVkMMmsAoGGU4JKwLuvBefF0pCq4FybNSnfkfRCpC7ZW7kttcC/TrRtAJsvGtg==",
-      "dev": true
-    },
-    "@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
-      "dev": true
-    },
-    "@types/q": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
-      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
-      "dev": true
-    },
-    "@vue/babel-helper-vue-jsx-merge-props": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
-      "integrity": "sha512-6tyf5Cqm4m6v7buITuwS+jHzPlIPxbFzEhXR5JGZpbrvOcp1hiQKckd305/3C7C36wFekNTQSxAtgeM0j0yoUw==",
-      "dev": true
-    },
-    "@vue/babel-plugin-transform-vue-jsx": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.1.2.tgz",
-      "integrity": "sha512-YfdaoSMvD1nj7+DsrwfTvTnhDXI7bsuh+Y5qWwvQXlD24uLgnsoww3qbiZvWf/EoviZMrvqkqN4CBw0W3BWUTQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/plugin-syntax-jsx": "^7.2.0",
-        "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
-        "html-tags": "^2.0.0",
-        "lodash.kebabcase": "^4.1.1",
-        "svg-tags": "^1.0.0"
-      }
-    },
-    "@vue/babel-preset-app": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.2.3.tgz",
-      "integrity": "sha512-Xlc8d9Ebgu9pNZMUxKZWVP2CctVZzfX3LAxjBDWAAIiVpdXX4IkQQCevDhgiANFzlmE3KXtiSgPGs57Sso2g7Q==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.8.4",
-        "@babel/helper-compilation-targets": "^7.8.4",
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/plugin-proposal-class-properties": "^7.8.3",
-        "@babel/plugin-proposal-decorators": "^7.8.3",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-jsx": "^7.8.3",
-        "@babel/plugin-transform-runtime": "^7.8.3",
-        "@babel/preset-env": "^7.8.4",
-        "@babel/runtime": "^7.8.4",
-        "@vue/babel-preset-jsx": "^1.1.2",
-        "babel-plugin-dynamic-import-node": "^2.3.0",
-        "core-js": "^3.6.4",
-        "core-js-compat": "^3.6.4"
-      }
-    },
-    "@vue/babel-preset-jsx": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.2.tgz",
-      "integrity": "sha512-zDpVnFpeC9YXmvGIDSsKNdL7qCG2rA3gjywLYHPCKDT10erjxF4U+6ay9X6TW5fl4GsDlJp9bVfAVQAAVzxxvQ==",
-      "dev": true,
-      "requires": {
-        "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
-        "@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
-        "@vue/babel-sugar-functional-vue": "^1.1.2",
-        "@vue/babel-sugar-inject-h": "^1.1.2",
-        "@vue/babel-sugar-v-model": "^1.1.2",
-        "@vue/babel-sugar-v-on": "^1.1.2"
-      }
-    },
-    "@vue/babel-sugar-functional-vue": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.1.2.tgz",
-      "integrity": "sha512-YhmdJQSVEFF5ETJXzrMpj0nkCXEa39TvVxJTuVjzvP2rgKhdMmQzlJuMv/HpadhZaRVMCCF3AEjjJcK5q/cYzQ==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-syntax-jsx": "^7.2.0"
-      }
-    },
-    "@vue/babel-sugar-inject-h": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.1.2.tgz",
-      "integrity": "sha512-VRSENdTvD5htpnVp7i7DNuChR5rVMcORdXjvv5HVvpdKHzDZAYiLSD+GhnhxLm3/dMuk8pSzV+k28ECkiN5m8w==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-syntax-jsx": "^7.2.0"
-      }
-    },
-    "@vue/babel-sugar-v-model": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.1.2.tgz",
-      "integrity": "sha512-vLXPvNq8vDtt0u9LqFdpGM9W9IWDmCmCyJXuozlq4F4UYVleXJ2Fa+3JsnTZNJcG+pLjjfnEGHci2339Kj5sGg==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-syntax-jsx": "^7.2.0",
-        "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
-        "@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
-        "camelcase": "^5.0.0",
-        "html-tags": "^2.0.0",
-        "svg-tags": "^1.0.0"
-      }
-    },
-    "@vue/babel-sugar-v-on": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.1.2.tgz",
-      "integrity": "sha512-T8ZCwC8Jp2uRtcZ88YwZtZXe7eQrJcfRq0uTFy6ShbwYJyz5qWskRFoVsdTi9o0WEhmQXxhQUewodOSCUPVmsQ==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-syntax-jsx": "^7.2.0",
-        "@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
-        "camelcase": "^5.0.0"
-      }
-    },
-    "@vue/cli-overlay": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.2.3.tgz",
-      "integrity": "sha512-V51eS7NIsK/rv19oK0+B5Yl/VNWCJTTkjibreIXDknOLSH3MKTOJamUI1BEYo5FOXBWw+7DLmaNF3XKemQ5Y/w==",
-      "dev": true
-    },
-    "@vue/cli-plugin-babel": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-4.2.3.tgz",
-      "integrity": "sha512-vbK6f7dN4gj+6xyhTZkvjjbz1vsTwX+ObRD0ElaaipXo2oVSBAAPPGHkLjnH8C2brDLPeLHdUCzERzx2kc2lmQ==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.8.4",
-        "@vue/babel-preset-app": "^4.2.3",
-        "@vue/cli-shared-utils": "^4.2.3",
-        "babel-loader": "^8.0.6",
-        "cache-loader": "^4.1.0",
-        "thread-loader": "^2.1.3",
-        "webpack": "^4.0.0"
-      }
-    },
-    "@vue/cli-plugin-eslint": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.2.3.tgz",
-      "integrity": "sha512-r3J0OAa8x0tZZYFxxFZ/C5WWxYGGH8hLfUUhs3FePo0VsBci28lrgvnBqr69uj/T40v/ndBh0geAz28mjjQ+mg==",
-      "dev": true,
-      "requires": {
-        "@vue/cli-shared-utils": "^4.2.3",
-        "eslint-loader": "^2.1.2",
-        "globby": "^9.2.0",
-        "inquirer": "^6.3.1",
-        "webpack": "^4.0.0",
-        "yorkie": "^2.0.0"
-      }
-    },
-    "@vue/cli-plugin-router": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.2.3.tgz",
-      "integrity": "sha512-RGtgFQCTMS1X1wtFt752RMgr/LlF9cfpH37MkwjhF2wpnyTp+hkKl/09QORAKW91I8iFpZFH7xZKMBS3r1WbCw==",
-      "dev": true,
-      "requires": {
-        "@vue/cli-shared-utils": "^4.2.3"
-      }
-    },
-    "@vue/cli-plugin-vuex": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.2.3.tgz",
-      "integrity": "sha512-7M4CaoAD4W/GdiDI4+Gh2tATPFBnb/u7bCiLLDsuL9ztypv7l3p4cu43zkDpTCCuufkZFYtZwysOAY8SbGqOjg==",
-      "dev": true
-    },
-    "@vue/cli-service": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.2.3.tgz",
-      "integrity": "sha512-eSsmrt7nIZInmEvVW5x7eQLdEywBin79nKduB2PgYx0Me82wRfKDa8JpkCM6jZV0AxIuaF7N4RkPOtlkrBKX9Q==",
-      "dev": true,
-      "requires": {
-        "@intervolga/optimize-cssnano-plugin": "^1.0.5",
-        "@soda/friendly-errors-webpack-plugin": "^1.7.1",
-        "@vue/cli-overlay": "^4.2.3",
-        "@vue/cli-plugin-router": "^4.2.3",
-        "@vue/cli-plugin-vuex": "^4.2.3",
-        "@vue/cli-shared-utils": "^4.2.3",
-        "@vue/component-compiler-utils": "^3.0.2",
-        "@vue/preload-webpack-plugin": "^1.1.0",
-        "@vue/web-component-wrapper": "^1.2.0",
-        "acorn": "^7.1.0",
-        "acorn-walk": "^7.0.0",
-        "address": "^1.1.2",
-        "autoprefixer": "^9.7.4",
-        "browserslist": "^4.8.6",
-        "cache-loader": "^4.1.0",
-        "case-sensitive-paths-webpack-plugin": "^2.3.0",
-        "cli-highlight": "^2.1.4",
-        "clipboardy": "^2.1.0",
-        "cliui": "^6.0.0",
-        "copy-webpack-plugin": "^5.1.1",
-        "css-loader": "^3.4.2",
-        "cssnano": "^4.1.10",
-        "current-script-polyfill": "^1.0.0",
-        "debug": "^4.1.1",
-        "default-gateway": "^5.0.5",
-        "dotenv": "^8.2.0",
-        "dotenv-expand": "^5.1.0",
-        "file-loader": "^4.2.0",
-        "fs-extra": "^7.0.1",
-        "globby": "^9.2.0",
-        "hash-sum": "^2.0.0",
-        "html-webpack-plugin": "^3.2.0",
-        "launch-editor-middleware": "^2.2.1",
-        "lodash.defaultsdeep": "^4.6.1",
-        "lodash.mapvalues": "^4.6.0",
-        "lodash.transform": "^4.6.0",
-        "mini-css-extract-plugin": "^0.9.0",
-        "minimist": "^1.2.0",
-        "pnp-webpack-plugin": "^1.6.0",
-        "portfinder": "^1.0.25",
-        "postcss-loader": "^3.0.0",
-        "ssri": "^7.1.0",
-        "terser-webpack-plugin": "^2.3.4",
-        "thread-loader": "^2.1.3",
-        "url-loader": "^2.2.0",
-        "vue-loader": "^15.8.3",
-        "vue-style-loader": "^4.1.2",
-        "webpack": "^4.0.0",
-        "webpack-bundle-analyzer": "^3.6.0",
-        "webpack-chain": "^6.3.1",
-        "webpack-dev-server": "^3.10.2",
-        "webpack-merge": "^4.2.2"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
-          "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
-          "dev": true
-        },
-        "cacache": {
-          "version": "13.0.1",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
-          "integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==",
-          "dev": true,
-          "requires": {
-            "chownr": "^1.1.2",
-            "figgy-pudding": "^3.5.1",
-            "fs-minipass": "^2.0.0",
-            "glob": "^7.1.4",
-            "graceful-fs": "^4.2.2",
-            "infer-owner": "^1.0.4",
-            "lru-cache": "^5.1.1",
-            "minipass": "^3.0.0",
-            "minipass-collect": "^1.0.2",
-            "minipass-flush": "^1.0.5",
-            "minipass-pipeline": "^1.2.2",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "p-map": "^3.0.0",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.7.1",
-            "ssri": "^7.0.0",
-            "unique-filename": "^1.1.1"
-          }
-        },
-        "find-cache-dir": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.0.tgz",
-          "integrity": "sha512-PtXtQb7IrD8O+h6Cq1dbpJH5NzD8+9keN1zZ0YlpDzl1PwXEJEBj6u1Xa92t1Hwluoozd9TNKul5Hi2iqpsWwg==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^3.0.2",
-            "pkg-dir": "^4.1.0"
-          }
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "make-dir": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz",
-          "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.0.0"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "schema-utils": {
-          "version": "2.6.4",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
-          "integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.10.2",
-            "ajv-keywords": "^3.4.1"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "ssri": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz",
-          "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1",
-            "minipass": "^3.1.1"
-          }
-        },
-        "terser-webpack-plugin": {
-          "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz",
-          "integrity": "sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w==",
-          "dev": true,
-          "requires": {
-            "cacache": "^13.0.1",
-            "find-cache-dir": "^3.2.0",
-            "jest-worker": "^25.1.0",
-            "p-limit": "^2.2.2",
-            "schema-utils": "^2.6.4",
-            "serialize-javascript": "^2.1.2",
-            "source-map": "^0.6.1",
-            "terser": "^4.4.3",
-            "webpack-sources": "^1.4.3"
-          }
-        }
-      }
-    },
-    "@vue/cli-shared-utils": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.2.3.tgz",
-      "integrity": "sha512-GCoTB6vMZsi9z/Bmn8/C9IlnUw8eeHONOGE+48TJkZyulftVFhlwVWjTFp5GuDAlwpTWarHchW9IoVu3pIIGfA==",
-      "dev": true,
-      "requires": {
-        "@hapi/joi": "^15.0.1",
-        "chalk": "^2.4.2",
-        "execa": "^1.0.0",
-        "launch-editor": "^2.2.1",
-        "lru-cache": "^5.1.1",
-        "node-ipc": "^9.1.1",
-        "open": "^6.3.0",
-        "ora": "^3.4.0",
-        "read-pkg": "^5.1.1",
-        "request": "^2.87.0",
-        "request-promise-native": "^1.0.8",
-        "semver": "^6.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "@vue/component-compiler-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.1.1.tgz",
-      "integrity": "sha512-+lN3nsfJJDGMNz7fCpcoYIORrXo0K3OTsdr8jCM7FuqdI4+70TY6gxY6viJ2Xi1clqyPg7LpeOWwjF31vSMmUw==",
-      "dev": true,
-      "requires": {
-        "consolidate": "^0.15.1",
-        "hash-sum": "^1.0.2",
-        "lru-cache": "^4.1.2",
-        "merge-source-map": "^1.1.0",
-        "postcss": "^7.0.14",
-        "postcss-selector-parser": "^6.0.2",
-        "prettier": "^1.18.2",
-        "source-map": "~0.6.1",
-        "vue-template-es2015-compiler": "^1.9.0"
-      },
-      "dependencies": {
-        "hash-sum": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-          "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-          "dev": true
-        }
-      }
-    },
-    "@vue/eslint-config-prettier": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npm.taobao.org/@vue/eslint-config-prettier/download/@vue/eslint-config-prettier-5.1.0.tgz",
-      "integrity": "sha1-g3JBom7TlpdsuNq9d5OTAyRVI88=",
-      "dev": true,
-      "requires": {
-        "eslint-config-prettier": "^6.0.0"
-      }
-    },
-    "@vue/preload-webpack-plugin": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.1.tgz",
-      "integrity": "sha512-8VCoJeeH8tCkzhkpfOkt+abALQkS11OIHhte5MBzYaKMTqK0A3ZAKEUVAffsOklhEv7t0yrQt696Opnu9oAx+w==",
-      "dev": true
-    },
-    "@vue/web-component-wrapper": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.2.0.tgz",
-      "integrity": "sha512-Xn/+vdm9CjuC9p3Ae+lTClNutrVhsXpzxvoTXXtoys6kVRX9FkueSUAqSWAyZntmVLlR4DosBV4pH8y5Z/HbUw==",
-      "dev": true
-    },
-    "@webassemblyjs/ast": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5"
-      }
-    },
-    "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-code-frame": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/wast-printer": "1.8.5"
-      }
-    },
-    "@webassemblyjs/helper-fsm": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-module-context": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "^0.0.3"
-      }
-    },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5"
-      }
-    },
-    "@webassemblyjs/ieee754": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
-      "dev": true,
-      "requires": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "@webassemblyjs/leb128": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
-      "dev": true,
-      "requires": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/utf8": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
-      "dev": true
-    },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/helper-wasm-section": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-opt": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "@webassemblyjs/wast-printer": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wasm-gen": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wasm-opt": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wasm-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wast-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-code-frame": "1.8.5",
-        "@webassemblyjs/helper-fsm": "1.8.5",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/wast-printer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "dev": true,
-      "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
-      }
-    },
-    "acorn": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-6.4.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-6.4.0.tgz",
-      "integrity": "sha1-tlnS/7r6JLr12xzbsslKmD7NJ4Q=",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npm.taobao.org/acorn-jsx/download/acorn-jsx-5.1.0.tgz?cache=0&sync_timestamp=1570991459312&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn-jsx%2Fdownload%2Facorn-jsx-5.1.0.tgz",
-      "integrity": "sha1-KUrbcbVzmLBoABXwo4xWPuHbU4Q=",
-      "dev": true
-    },
-    "acorn-walk": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz",
-      "integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==",
-      "dev": true
-    },
-    "address": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz",
-      "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==",
-      "dev": true
-    },
-    "aggregate-error": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz",
-      "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==",
-      "dev": true,
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
-    "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.10.2.tgz",
-      "integrity": "sha1-086gTWsBeyiUrWkED+yLYj60vVI=",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ajv-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true
-    },
-    "ajv-keywords": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.4.1.tgz",
-      "integrity": "sha1-75FuJxxkrBIXH9g4TqrmsjRYVNo=",
-      "dev": true
-    },
-    "alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
-      "dev": true
-    },
-    "ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-      "dev": true
-    },
-    "ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npm.taobao.org/ansi-escapes/download/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha1-h4C5j/nb9WOBUtHx/lwde0RCl2s=",
-      "dev": true
-    },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.1.0.tgz",
-      "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc=",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz?cache=0&sync_timestamp=1573557674483&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-3.2.1.tgz",
-      "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-      "dev": true
-    },
-    "anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
-      }
-    },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
-    },
-    "arch": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz",
-      "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==",
-      "dev": true
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npm.taobao.org/argparse/download/argparse-1.0.10.tgz",
-      "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
-    },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-      "dev": true
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
-    },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        },
-        "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.1"
-          }
-        }
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
-    },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
-    },
-    "astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/astral-regex/download/astral-regex-1.0.0.tgz",
-      "integrity": "sha1-bIw/uCfdQ+45GPJ7gngqt2WKb9k=",
-      "dev": true
-    },
-    "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.14"
-      }
-    },
-    "async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
-    },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
-    },
-    "async-validator": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
-      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
-      "requires": {
-        "babel-runtime": "6.x"
-      }
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
-    "autoprefixer": {
-      "version": "9.7.4",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.4.tgz",
-      "integrity": "sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.8.3",
-        "caniuse-lite": "^1.0.30001020",
-        "chalk": "^2.4.2",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.26",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
-      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
-      "dev": true
-    },
-    "axios": {
-      "version": "0.19.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-      "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
-      "requires": {
-        "follow-redirects": "1.5.10"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "follow-redirects": {
-          "version": "1.5.10",
-          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
-          "requires": {
-            "debug": "=3.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "babel-eslint": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
-      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.0",
-        "@babel/traverse": "^7.7.0",
-        "@babel/types": "^7.7.0",
-        "eslint-visitor-keys": "^1.0.0",
-        "resolve": "^1.12.0"
-      }
-    },
-    "babel-helper-vue-jsx-merge-props": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
-      "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
-    },
-    "babel-loader": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
-      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
-      "dev": true,
-      "requires": {
-        "find-cache-dir": "^2.0.0",
-        "loader-utils": "^1.0.2",
-        "mkdirp": "^0.5.1",
-        "pify": "^4.0.1"
-      }
-    },
-    "babel-plugin-dynamic-import-node": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
-      "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
-      "dev": true,
-      "requires": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.11",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
-        },
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-        }
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
-      "dev": true
-    },
-    "batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-      "dev": true
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "bfj": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz",
-      "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.5.5",
-        "check-types": "^8.0.3",
-        "hoopy": "^0.1.4",
-        "tryer": "^1.0.1"
-      }
-    },
-    "big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npm.taobao.org/big.js/download/big.js-5.2.2.tgz",
-      "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=",
-      "dev": true
-    },
-    "binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true
-    },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-      "dev": true
-    },
-    "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-          "dev": true
-        }
-      }
-    },
-    "bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-      "dev": true,
-      "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
-      },
-      "dependencies": {
-        "array-flatten": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-          "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-          "dev": true
-        }
-      }
-    },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-      "dev": true
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz",
-      "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "requires": {
-        "pako": "~1.0.5"
-      }
-    },
-    "browserslist": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz",
-      "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "^1.0.30001030",
-        "electron-to-chromium": "^1.3.363",
-        "node-releases": "^1.1.50"
-      }
-    },
-    "buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
-      "dev": true
-    },
-    "buffer-json": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-json/-/buffer-json-2.0.0.tgz",
-      "integrity": "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==",
-      "dev": true
-    },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-      "dev": true
-    },
-    "cacache": {
-      "version": "12.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
-      "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      }
-    },
-    "cache-loader": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-4.1.0.tgz",
-      "integrity": "sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw==",
-      "dev": true,
-      "requires": {
-        "buffer-json": "^2.0.0",
-        "find-cache-dir": "^3.0.0",
-        "loader-utils": "^1.2.3",
-        "mkdirp": "^0.5.1",
-        "neo-async": "^2.6.1",
-        "schema-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "find-cache-dir": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.0.tgz",
-          "integrity": "sha512-PtXtQb7IrD8O+h6Cq1dbpJH5NzD8+9keN1zZ0YlpDzl1PwXEJEBj6u1Xa92t1Hwluoozd9TNKul5Hi2iqpsWwg==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^3.0.2",
-            "pkg-dir": "^4.1.0"
-          }
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "make-dir": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz",
-          "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.0.0"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "call-me-maybe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
-      "dev": true
-    },
-    "caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-      "dev": true,
-      "requires": {
-        "callsites": "^2.0.0"
-      }
-    },
-    "caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
-      "dev": true,
-      "requires": {
-        "caller-callsite": "^2.0.0"
-      }
-    },
-    "callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-      "dev": true
-    },
-    "camel-case": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
-      "dev": true,
-      "requires": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
-      }
-    },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true
-    },
-    "caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001031",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001031.tgz",
-      "integrity": "sha512-DpAP5a1NGRLgYfaNCaXIRyGARi+3tJA2quZXNNA1Du26VyVkqvy2tznNu5ANyN1Y5aX44QDotZSVSUSi2uMGjg==",
-      "dev": true
-    },
-    "case-sensitive-paths-webpack-plugin": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz",
-      "integrity": "sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ==",
-      "dev": true
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1573282918610&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz",
-      "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npm.taobao.org/chardet/download/chardet-0.7.0.tgz",
-      "integrity": "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4=",
-      "dev": true
-    },
-    "check-types": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
-      "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==",
-      "dev": true
-    },
-    "chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "requires": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "fsevents": "^1.2.7",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      }
-    },
-    "chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true
-    },
-    "chrome-trace-event": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "ci-info": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
-      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
-      "dev": true
-    },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "clean-css": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
-      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
-      "dev": true,
-      "requires": {
-        "source-map": "~0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true
-    },
-    "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/cli-cursor/download/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^2.0.0"
-      }
-    },
-    "cli-highlight": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.4.tgz",
-      "integrity": "sha512-s7Zofobm20qriqDoU9sXptQx0t2R9PEgac92mENNm7xaEe1hn71IIMsXMK+6encA6WRCWWxIGQbipr3q998tlQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^3.0.0",
-        "highlight.js": "^9.6.0",
-        "mz": "^2.4.0",
-        "parse5": "^5.1.1",
-        "parse5-htmlparser2-tree-adapter": "^5.1.1",
-        "yargs": "^15.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "cli-spinners": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz",
-      "integrity": "sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==",
-      "dev": true
-    },
-    "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npm.taobao.org/cli-width/download/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-      "dev": true
-    },
-    "clipboard": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz",
-      "integrity": "sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==",
-      "requires": {
-        "good-listener": "^1.2.2",
-        "select": "^1.1.2",
-        "tiny-emitter": "^2.0.0"
-      }
-    },
-    "clipboardy": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.2.0.tgz",
-      "integrity": "sha512-9ry9nC3VFULNmoEIqvuRwCIQ9M7wjnm4O+yvk7xkmhR+7FAUWaeX751oeYJbORg0h0zmqW1EVDoZK8f7yapwbg==",
-      "dev": true,
-      "requires": {
-        "arch": "^2.1.1",
-        "execa": "^1.0.0",
-        "is-wsl": "^2.1.1"
-      },
-      "dependencies": {
-        "is-wsl": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz",
-          "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==",
-          "dev": true
-        }
-      }
-    },
-    "cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
-      }
-    },
-    "clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true
-    },
-    "clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      }
-    },
-    "coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dev": true,
-      "requires": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      }
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
-    },
-    "codemirror": {
-      "version": "5.52.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.52.0.tgz",
-      "integrity": "sha512-K2UB6zjscrfME03HeRe/IuOmCeqNpw7PLKGHThYpLbZEuKf+ZoujJPhxZN4hHJS1O7QyzEsV7JJZGxuQWVaFCg=="
-    },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      }
-    },
-    "color": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
-      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.2"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-1.9.3.tgz",
-      "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "color-string": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
-      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
-      "dev": true,
-      "requires": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
-    "compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dev": true,
-      "requires": {
-        "mime-db": ">= 1.43.0 < 2"
-      }
-    },
-    "compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-      "dev": true
-    },
-    "console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "consolidate": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.1.1"
-      }
-    },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
-    },
-    "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-      "dev": true
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-      "dev": true
-    },
-    "copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
-    },
-    "copy-webpack-plugin": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz",
-      "integrity": "sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==",
-      "dev": true,
-      "requires": {
-        "cacache": "^12.0.3",
-        "find-cache-dir": "^2.1.0",
-        "glob-parent": "^3.1.0",
-        "globby": "^7.1.1",
-        "is-glob": "^4.0.1",
-        "loader-utils": "^1.2.3",
-        "minimatch": "^3.0.4",
-        "normalize-path": "^3.0.0",
-        "p-limit": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^2.1.2",
-        "webpack-log": "^2.0.0"
-      },
-      "dependencies": {
-        "globby": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-          "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
-          "dev": true,
-          "requires": {
-            "array-union": "^1.0.1",
-            "dir-glob": "^2.0.0",
-            "glob": "^7.1.2",
-            "ignore": "^3.3.5",
-            "pify": "^3.0.0",
-            "slash": "^1.0.0"
-          }
-        },
-        "ignore": {
-          "version": "3.3.10",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-          "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-          "dev": true
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        },
-        "slash": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-          "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-          "dev": true
-        }
-      }
-    },
-    "core-js": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-      "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="
-    },
-    "core-js-compat": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz",
-      "integrity": "sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.8.3",
-        "semver": "7.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-          "dev": true
-        }
-      }
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
-    "cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-      "dev": true,
-      "requires": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
-      },
-      "dependencies": {
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        }
-      }
-    },
-    "create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
-      }
-    },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz?cache=0&sync_timestamp=1570439926300&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-6.0.5.tgz",
-      "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
-      "dev": true,
-      "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
-    "crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      }
-    },
-    "css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-      "dev": true
-    },
-    "css-declaration-sorter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.1",
-        "timsort": "^0.3.0"
-      }
-    },
-    "css-loader": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.4.2.tgz",
-      "integrity": "sha512-jYq4zdZT0oS0Iykt+fqnzVLRIeiPWhka+7BqPn+oSIpWJAHak5tmB/WZrJ2a21JhCeFyNnnlroSl8c+MtVndzA==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.3.1",
-        "cssesc": "^3.0.0",
-        "icss-utils": "^4.1.1",
-        "loader-utils": "^1.2.3",
-        "normalize-path": "^3.0.0",
-        "postcss": "^7.0.23",
-        "postcss-modules-extract-imports": "^2.0.0",
-        "postcss-modules-local-by-default": "^3.0.2",
-        "postcss-modules-scope": "^2.1.1",
-        "postcss-modules-values": "^3.0.0",
-        "postcss-value-parser": "^4.0.2",
-        "schema-utils": "^2.6.0"
-      }
-    },
-    "css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-      "dev": true,
-      "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^3.2.1",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
-      }
-    },
-    "css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
-      "dev": true
-    },
-    "css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "dev": true,
-      "requires": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "css-what": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz",
-      "integrity": "sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==",
-      "dev": true
-    },
-    "cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true
-    },
-    "cssnano": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
-      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.7",
-        "is-resolvable": "^1.0.0",
-        "postcss": "^7.0.0"
-      }
-    },
-    "cssnano-preset-default": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
-      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
-      "dev": true,
-      "requires": {
-        "css-declaration-sorter": "^4.0.1",
-        "cssnano-util-raw-cache": "^4.0.1",
-        "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.1",
-        "postcss-colormin": "^4.0.3",
-        "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.2",
-        "postcss-discard-duplicates": "^4.0.2",
-        "postcss-discard-empty": "^4.0.1",
-        "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.11",
-        "postcss-merge-rules": "^4.0.3",
-        "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.2",
-        "postcss-minify-params": "^4.0.2",
-        "postcss-minify-selectors": "^4.0.2",
-        "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.2",
-        "postcss-normalize-positions": "^4.0.2",
-        "postcss-normalize-repeat-style": "^4.0.2",
-        "postcss-normalize-string": "^4.0.2",
-        "postcss-normalize-timing-functions": "^4.0.2",
-        "postcss-normalize-unicode": "^4.0.1",
-        "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.2",
-        "postcss-ordered-values": "^4.1.2",
-        "postcss-reduce-initial": "^4.0.3",
-        "postcss-reduce-transforms": "^4.0.2",
-        "postcss-svgo": "^4.0.2",
-        "postcss-unique-selectors": "^4.0.1"
-      }
-    },
-    "cssnano-util-get-arguments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
-      "dev": true
-    },
-    "cssnano-util-get-match": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
-      "dev": true
-    },
-    "cssnano-util-raw-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "cssnano-util-same-parent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
-      "dev": true
-    },
-    "csso": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.2.tgz",
-      "integrity": "sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==",
-      "dev": true,
-      "requires": {
-        "css-tree": "1.0.0-alpha.37"
-      }
-    },
-    "current-script-polyfill": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/current-script-polyfill/-/current-script-polyfill-1.0.0.tgz",
-      "integrity": "sha1-8xz35PPiGLBybnOMqSoC00iO9hU=",
-      "dev": true
-    },
-    "cyclist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
-      "dev": true
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "dayjs": {
-      "version": "1.8.21",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.21.tgz",
-      "integrity": "sha512-1kbWK0hziklUHkGgiKr7xm59KwAg/K3Tp7H/8X+f58DnNCwY3pKYjOCJpIlVs125FRBukGVZdKZojC073D0IeQ=="
-    },
-    "de-indent": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz",
-      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
-      "dev": true
-    },
-    "debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "dev": true,
-      "requires": {
-        "ms": "^2.1.1"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
-    },
-    "deep-equal": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
-      "dev": true,
-      "requires": {
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.1",
-        "is-regex": "^1.0.4",
-        "object-is": "^1.0.1",
-        "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.2.0"
-      }
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npm.taobao.org/deep-is/download/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "deepmerge": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
-    },
-    "default-gateway": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.5.tgz",
-      "integrity": "sha512-z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA==",
-      "dev": true,
-      "requires": {
-        "execa": "^3.3.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz",
-          "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "execa": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
-          "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^7.0.0",
-            "get-stream": "^5.0.0",
-            "human-signals": "^1.1.1",
-            "is-stream": "^2.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^4.0.0",
-            "onetime": "^5.1.0",
-            "p-finally": "^2.0.0",
-            "signal-exit": "^3.0.2",
-            "strip-final-newline": "^2.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "is-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-          "dev": true
-        },
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-          "dev": true
-        },
-        "npm-run-path": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.0.0"
-          }
-        },
-        "onetime": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-          "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-          "dev": true,
-          "requires": {
-            "mimic-fn": "^2.1.0"
-          }
-        },
-        "p-finally": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
-          "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
-          "dev": true
-        },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "dev": true,
-      "requires": {
-        "clone": "^1.0.2"
-      }
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-      "dev": true,
-      "requires": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "dependencies": {
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-          "dev": true,
-          "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-              "dev": true
-            }
-          }
-        },
-        "p-map": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-          "dev": true
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
-    },
-    "delegate": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
-      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true
-    },
-    "des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
-    },
-    "detect-node": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
-      "dev": true
-    },
-    "diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "dir-glob": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
-      "dev": true,
-      "requires": {
-        "path-type": "^3.0.0"
-      }
-    },
-    "dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
-      "dev": true
-    },
-    "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
-      "dev": true,
-      "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-      "dev": true,
-      "requires": {
-        "buffer-indexof": "^1.0.0"
-      }
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npm.taobao.org/doctrine/download/doctrine-3.0.0.tgz",
-      "integrity": "sha1-rd6+rXKmV023g2OdyHoSF3OXOWE=",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
-      "requires": {
-        "utila": "~0.4"
-      }
-    },
-    "dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
-          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
-          "dev": true
-        }
-      }
-    },
-    "domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true
-    },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1"
-      }
-    },
-    "domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "dot-prop": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz",
-      "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==",
-      "dev": true,
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
-    "dotenv": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
-      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
-      "dev": true
-    },
-    "dotenv-expand": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
-      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
-      "dev": true
-    },
-    "duplexer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-      "dev": true
-    },
-    "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "easy-stack": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.0.tgz",
-      "integrity": "sha1-EskbMIWjfwuqM26UhurEv5Tj54g=",
-      "dev": true
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "echarts": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.6.0.tgz",
-      "integrity": "sha512-xKkcr6v9UVOSF+PMuj7Ngt3bnzLwN1sSXWCvpvX+jYb3mePYsZnABq7wGkPac/m0nV653uGHXoHK8DCKCprdNg==",
-      "requires": {
-        "zrender": "4.2.0"
-      }
-    },
-    "echarts-amap": {
-      "version": "1.0.0-rc.6",
-      "resolved": "https://registry.npmjs.org/echarts-amap/-/echarts-amap-1.0.0-rc.6.tgz",
-      "integrity": "sha1-V4KnTa7lLtRM4/j2JXdWF4PwnhY="
-    },
-    "echarts-liquidfill": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/echarts-liquidfill/-/echarts-liquidfill-2.0.5.tgz",
-      "integrity": "sha512-3G19W5ngoh1L3BXYuD34g0Vd30ORWvQtyxRuL+7vmOZ3FkF6xkgD4pfcCL7QVAQOr+XZ4OiD2ot6dNGsRhflcg=="
-    },
-    "echarts-wordcloud": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/echarts-wordcloud/-/echarts-wordcloud-1.1.3.tgz",
-      "integrity": "sha512-Et8D5xEAoYkidmHun+hEH+2lF9dhCt6D0JJ390vlr2r/1zwhhZAbcL01CEvG93QcMcJpSvSPK8vRiGkTbMHRxg=="
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "ejs": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
-      "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
-      "dev": true
-    },
-    "electron-to-chromium": {
-      "version": "1.3.366",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.366.tgz",
-      "integrity": "sha512-MWtwlJaX/MqAH4V7j4pFasq2O4OIH7MltGTEVvzyeuUW+CPYsx+fuVg/MSBrTL4PzZjHidOixaELNy75/XFK1g==",
-      "dev": true
-    },
-    "element-ui": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.0.tgz",
-      "integrity": "sha512-KYsHWsBXYbLELS8cdfvgJTOMSUby3UEjvsPV1V1VmgJ/DdkOAS4z3MiOrPxrT9w2Cc5lZ4eVSQiGhYFR5NVChw==",
-      "requires": {
-        "async-validator": "~1.8.1",
-        "babel-helper-vue-jsx-merge-props": "^2.0.0",
-        "deepmerge": "^1.2.0",
-        "normalize-wheel": "^1.0.1",
-        "resize-observer-polyfill": "^1.5.0",
-        "throttle-debounce": "^1.0.1"
-      }
-    },
-    "elliptic": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
-      }
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "enhanced-resolve": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
-      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.5.0",
-        "tapable": "^1.0.0"
-      },
-      "dependencies": {
-        "memory-fs": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-          "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-          "dev": true,
-          "requires": {
-            "errno": "^0.1.3",
-            "readable-stream": "^2.0.1"
-          }
-        }
-      }
-    },
-    "entities": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
-      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
-      "dev": true
-    },
-    "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-      "dev": true,
-      "requires": {
-        "prr": "~1.0.1"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "error-stack-parser": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz",
-      "integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==",
-      "dev": true,
-      "requires": {
-        "stackframe": "^1.1.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.17.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-      "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
-      "dev": true,
-      "requires": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.1.5",
-        "is-regex": "^1.0.5",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimleft": "^2.1.1",
-        "string.prototype.trimright": "^2.1.1"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "eslint": {
-      "version": "5.16.0",
-      "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-5.16.0.tgz?cache=0&sync_timestamp=1576875900958&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-5.16.0.tgz",
-      "integrity": "sha1-oeOsGq5KP72Clvz496tzFMu2q+o=",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.9.1",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "eslint-scope": "^4.0.3",
-        "eslint-utils": "^1.3.1",
-        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^5.0.1",
-        "esquery": "^1.0.1",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob": "^7.1.2",
-        "globals": "^11.7.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^6.2.2",
-        "js-yaml": "^3.13.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.11",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.2",
-        "path-is-inside": "^1.0.2",
-        "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^5.5.1",
-        "strip-ansi": "^4.0.0",
-        "strip-json-comments": "^2.0.1",
-        "table": "^5.2.3",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz",
-          "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "import-fresh": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.2.1.tgz?cache=0&sync_timestamp=1573665074534&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.2.1.tgz",
-          "integrity": "sha1-Yz/2GFBueTr1rJG/SLcmd+FcvmY=",
-          "dev": true,
-          "requires": {
-            "parent-module": "^1.0.0",
-            "resolve-from": "^4.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
-          "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-          "dev": true
-        },
-        "resolve-from": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/resolve-from/download/resolve-from-4.0.0.tgz",
-          "integrity": "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "eslint-config-prettier": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npm.taobao.org/eslint-config-prettier/download/eslint-config-prettier-6.7.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-config-prettier%2Fdownload%2Feslint-config-prettier-6.7.0.tgz",
-      "integrity": "sha1-modpUuEt8rKErb00QJlL8fOd+7k=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^6.0.0"
-      }
-    },
-    "eslint-loader": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz",
-      "integrity": "sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg==",
-      "dev": true,
-      "requires": {
-        "loader-fs-cache": "^1.0.0",
-        "loader-utils": "^1.0.2",
-        "object-assign": "^4.0.1",
-        "object-hash": "^1.1.4",
-        "rimraf": "^2.6.1"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "eslint-plugin-prettier": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npm.taobao.org/eslint-plugin-prettier/download/eslint-plugin-prettier-3.1.2.tgz",
-      "integrity": "sha1-Qy5aZnZmq4TOcvlFxy932Zalybo=",
-      "dev": true,
-      "requires": {
-        "prettier-linter-helpers": "^1.0.0"
-      }
-    },
-    "eslint-plugin-vue": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npm.taobao.org/eslint-plugin-vue/download/eslint-plugin-vue-5.2.3.tgz?cache=0&sync_timestamp=1573637114128&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-plugin-vue%2Fdownload%2Feslint-plugin-vue-5.2.3.tgz",
-      "integrity": "sha1-PudZfYI7VHiASy/rqYY7G3QnOWE=",
-      "dev": true,
-      "requires": {
-        "vue-eslint-parser": "^5.0.0"
-      }
-    },
-    "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npm.taobao.org/eslint-scope/download/eslint-scope-4.0.3.tgz",
-      "integrity": "sha1-ygODMxD2iJoyZHgaqC5j65z+eEg=",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npm.taobao.org/eslint-utils/download/eslint-utils-1.4.3.tgz",
-      "integrity": "sha1-dP7HxU0Hdrb2fgJRBAtYBlZOmB8=",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^1.1.0"
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npm.taobao.org/eslint-visitor-keys/download/eslint-visitor-keys-1.1.0.tgz",
-      "integrity": "sha1-4qgs6oT/JGrW+1f5veW0ZiFFnsI=",
-      "dev": true
-    },
-    "espree": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npm.taobao.org/espree/download/espree-5.0.1.tgz",
-      "integrity": "sha1-XWUm+k/H8HiKXPdbFfMDI+L4H3o=",
-      "dev": true,
-      "requires": {
-        "acorn": "^6.0.7",
-        "acorn-jsx": "^5.0.0",
-        "eslint-visitor-keys": "^1.0.0"
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz",
-      "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=",
-      "dev": true
-    },
-    "esquery": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/esquery/download/esquery-1.0.1.tgz",
-      "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.0.0"
-      }
-    },
-    "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npm.taobao.org/esrecurse/download/esrecurse-4.2.1.tgz",
-      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.1.0"
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npm.taobao.org/estraverse/download/estraverse-4.3.0.tgz",
-      "integrity": "sha1-OYrT88WiSUi+dyXoPRGn3ijNvR0=",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npm.taobao.org/esutils/download/esutils-2.0.3.tgz",
-      "integrity": "sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=",
-      "dev": true
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true
-    },
-    "event-pubsub": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz",
-      "integrity": "sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==",
-      "dev": true
-    },
-    "eventemitter3": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
-      "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
-      "dev": true
-    },
-    "events": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
-      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
-      "dev": true
-    },
-    "eventsource": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-      "dev": true,
-      "requires": {
-        "original": "^1.0.0"
-      }
-    },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      }
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.7",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-          "dev": true
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npm.taobao.org/external-editor/download/external-editor-3.1.0.tgz",
-      "integrity": "sha1-ywP3QL764D6k0oPK7SdBqD8zVJU=",
-      "dev": true,
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
-    },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
-    },
-    "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-deep-equal%2Fdownload%2Ffast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
-    },
-    "fast-diff": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/fast-diff/download/fast-diff-1.2.0.tgz",
-      "integrity": "sha1-c+4RmC2Gyq95WYKNUZz+kn+sXwM=",
-      "dev": true
-    },
-    "fast-glob": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-      "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
-      "dev": true,
-      "requires": {
-        "@mrmlnc/readdir-enhanced": "^2.2.1",
-        "@nodelib/fs.stat": "^1.1.2",
-        "glob-parent": "^3.1.0",
-        "is-glob": "^4.0.0",
-        "merge2": "^1.2.3",
-        "micromatch": "^3.1.10"
-      }
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-json-stable-stringify%2Fdownload%2Ffast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM=",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npm.taobao.org/fast-levenshtein/download/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "faye-websocket": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-      "dev": true,
-      "requires": {
-        "websocket-driver": ">=0.5.1"
-      }
-    },
-    "figgy-pudding": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
-      "dev": true
-    },
-    "figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/figures/download/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npm.taobao.org/file-entry-cache/download/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha1-yg9u+m3T1WEzP7FFFQZcL6/fQ5w=",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^2.0.1"
-      }
-    },
-    "file-loader": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz",
-      "integrity": "sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.2.3",
-        "schema-utils": "^2.5.0"
-      }
-    },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
-    "filesize": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
-      "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
-      "dev": true
-    },
-    "fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dev": true,
-      "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
-      }
-    },
-    "find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^3.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/flat-cache/download/flat-cache-2.0.1.tgz",
-      "integrity": "sha1-XSltbwS9pEpGMKMBQTvbwuwIXsA=",
-      "dev": true,
-      "requires": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npm.taobao.org/rimraf/download/rimraf-2.6.3.tgz?cache=0&sync_timestamp=1569342479629&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frimraf%2Fdownload%2Frimraf-2.6.3.tgz",
-          "integrity": "sha1-stEE/g2Psnz54KHNqCYt04M8bKs=",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "flatted": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/flatted/download/flatted-2.0.1.tgz",
-      "integrity": "sha1-aeV8qo8OrLwoHS4stFjUb9tEngg=",
-      "dev": true
-    },
-    "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "follow-redirects": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.10.0.tgz",
-      "integrity": "sha512-4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-      "dev": true
-    },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "requires": {
-        "map-cache": "^0.2.2"
-      }
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "dev": true
-    },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "fsevents": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
-      "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1",
-        "node-pre-gyp": "*"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "chownr": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "debug": {
-          "version": "3.2.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "deep-extend": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "fs-minipass": {
-          "version": "1.2.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.6.0"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
-        "ignore-walk": {
-          "version": "3.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimatch": "^3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minipass": {
-          "version": "2.9.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
-        },
-        "minizlib": {
-          "version": "1.3.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.9.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "needle": {
-          "version": "2.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "^3.2.6",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.14.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.1",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.2.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4.4.2"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "npm-normalize-package-bin": "^1.0.1"
-          }
-        },
-        "npm-normalize-package-bin": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "npm-packlist": {
-          "version": "1.4.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.13",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.8.6",
-            "minizlib": "^1.2.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.3"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "wide-align": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "^1.0.2 || 2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/functional-red-black-tree/download/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "gensync": {
-      "version": "1.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
-      "dev": true
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
-    },
-    "get-stdin": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npm.taobao.org/get-stdin/download/get-stdin-6.0.0.tgz",
-      "integrity": "sha1-ngm/cSs2CrkiXoEgSPcf3pyJZXs=",
-      "dev": true
-    },
-    "get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npm.taobao.org/glob/download/glob-7.1.6.tgz?cache=0&sync_timestamp=1573078079496&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob%2Fdownload%2Fglob-7.1.6.tgz",
-      "integrity": "sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      },
-      "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
-      }
-    },
-    "glob-to-regexp": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-      "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
-      "dev": true
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npm.taobao.org/globals/download/globals-11.12.0.tgz",
-      "integrity": "sha1-q4eVM4hooLq9hSV1gBjCp+uVxC4=",
-      "dev": true
-    },
-    "globby": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz",
-      "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
-      "dev": true,
-      "requires": {
-        "@types/glob": "^7.1.1",
-        "array-union": "^1.0.2",
-        "dir-glob": "^2.2.2",
-        "fast-glob": "^2.2.6",
-        "glob": "^7.1.3",
-        "ignore": "^4.0.3",
-        "pify": "^4.0.1",
-        "slash": "^2.0.0"
-      }
-    },
-    "good-listener": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
-      "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
-      "requires": {
-        "delegate": "^3.1.2"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-      "dev": true
-    },
-    "gzip-size": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
-      "dev": true,
-      "requires": {
-        "duplexer": "^0.1.1",
-        "pify": "^4.0.1"
-      }
-    },
-    "handle-thing": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
-      "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
-      "dev": true
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
-      }
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        }
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-      "dev": true
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "hash-base": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "hash-sum": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
-      "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
-      "dev": true
-    },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/he/download/he-1.2.0.tgz",
-      "integrity": "sha1-hK5l+n6vsWX922FWauFLrwVmTw8=",
-      "dev": true
-    },
-    "hex-color-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
-      "dev": true
-    },
-    "highlight.js": {
-      "version": "9.18.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz",
-      "integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg=="
-    },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "hoopy": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
-      "dev": true
-    },
-    "hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
-      "dev": true
-    },
-    "hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "hsl-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
-      "dev": true
-    },
-    "hsla-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
-      "dev": true
-    },
-    "html-comment-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
-      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
-      "dev": true
-    },
-    "html-entities": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
-      "dev": true
-    },
-    "html-minifier": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
-      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
-      "dev": true,
-      "requires": {
-        "camel-case": "3.0.x",
-        "clean-css": "4.2.x",
-        "commander": "2.17.x",
-        "he": "1.2.x",
-        "param-case": "2.1.x",
-        "relateurl": "0.2.x",
-        "uglify-js": "3.4.x"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.17.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-          "dev": true
-        }
-      }
-    },
-    "html-tags": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
-      "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=",
-      "dev": true
-    },
-    "html-webpack-plugin": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
-      "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
-      "dev": true,
-      "requires": {
-        "html-minifier": "^3.2.3",
-        "loader-utils": "^0.2.16",
-        "lodash": "^4.17.3",
-        "pretty-error": "^2.0.2",
-        "tapable": "^1.0.0",
-        "toposort": "^1.0.0",
-        "util.promisify": "1.0.0"
-      },
-      "dependencies": {
-        "big.js": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-          "dev": true
-        },
-        "json5": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-          "dev": true
-        },
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
-          "dev": true,
-          "requires": {
-            "big.js": "^3.1.3",
-            "emojis-list": "^2.0.0",
-            "json5": "^0.5.0",
-            "object-assign": "^4.0.1"
-          }
-        },
-        "util.promisify": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-          "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-          "dev": true,
-          "requires": {
-            "define-properties": "^1.1.2",
-            "object.getownpropertydescriptors": "^2.0.3"
-          }
-        }
-      }
-    },
-    "htmlparser2": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
-      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^1.3.1",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^3.1.1"
-      },
-      "dependencies": {
-        "entities": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
-    "http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-      "dev": true
-    },
-    "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "dev": true,
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        }
-      }
-    },
-    "http-parser-js": {
-      "version": "0.4.10",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
-      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
-      "dev": true
-    },
-    "http-proxy": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
-      "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
-      "dev": true,
-      "requires": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "http-proxy-middleware": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
-      "dev": true,
-      "requires": {
-        "http-proxy": "^1.17.0",
-        "is-glob": "^4.0.0",
-        "lodash": "^4.17.11",
-        "micromatch": "^3.1.10"
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
-    "human-signals": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz",
-      "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "icss-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
-      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.14"
-      }
-    },
-    "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true
-    },
-    "iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
-      "dev": true
-    },
-    "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npm.taobao.org/ignore/download/ignore-4.0.6.tgz",
-      "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=",
-      "dev": true
-    },
-    "import-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
-      "dev": true,
-      "requires": {
-        "import-from": "^2.1.0"
-      }
-    },
-    "import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-      "dev": true,
-      "requires": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "import-from": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-      "dev": true,
-      "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npm.taobao.org/imurmurhash/download/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
-    "indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-      "dev": true
-    },
-    "infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz",
-      "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=",
-      "dev": true
-    },
-    "inquirer": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npm.taobao.org/inquirer/download/inquirer-6.5.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finquirer%2Fdownload%2Finquirer-6.5.2.tgz",
-      "integrity": "sha1-rVCUI3XQNtMn/1KMCL1fqwiZKMo=",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^3.2.0",
-        "chalk": "^2.4.2",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^2.0.0",
-        "lodash": "^4.17.12",
-        "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rxjs": "^6.4.0",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^5.1.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz",
-          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
-    "internal-ip": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
-      "dev": true,
-      "requires": {
-        "default-gateway": "^4.2.0",
-        "ipaddr.js": "^1.9.0"
-      },
-      "dependencies": {
-        "default-gateway": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-          "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
-          "dev": true,
-          "requires": {
-            "execa": "^1.0.0",
-            "ip-regex": "^2.1.0"
-          }
-        }
-      }
-    },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "invert-kv": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-      "dev": true
-    },
-    "ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-      "dev": true
-    },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-      "dev": true
-    },
-    "ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "dev": true
-    },
-    "is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
-      "dev": true
-    },
-    "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-arguments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
-      "dev": true
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^1.0.0"
-      }
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "is-callable": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-      "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
-      "dev": true
-    },
-    "is-ci": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
-      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-      "dev": true,
-      "requires": {
-        "ci-info": "^1.5.0"
-      }
-    },
-    "is-color-stop": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
-      "dev": true,
-      "requires": {
-        "css-color-names": "^0.0.4",
-        "hex-color-regex": "^1.1.0",
-        "hsl-regex": "^1.0.0",
-        "hsla-regex": "^1.0.0",
-        "rgb-regex": "^1.0.1",
-        "rgba-regex": "^1.0.0"
-      }
-    },
-    "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
-      "dev": true
-    },
-    "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-      "dev": true
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true
-    },
-    "is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "^2.1.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "^1.0.2"
-      }
-    },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/is-promise/download/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true
-    },
-    "is-svg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
-      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
-      "dev": true,
-      "requires": {
-        "html-comment-regex": "^1.1.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
-    },
-    "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "dev": true
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
-    "javascript-stringify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.0.1.tgz",
-      "integrity": "sha512-yV+gqbd5vaOYjqlbk16EG89xB5udgjqQF3C5FAORDg4f/IS1Yc5ERCv5e/57yBcfJYw05V5JyIXabhwb75Xxow==",
-      "dev": true
-    },
-    "jest-worker": {
-      "version": "25.1.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz",
-      "integrity": "sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==",
-      "dev": true,
-      "requires": {
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "js-message": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.5.tgz",
-      "integrity": "sha1-IwDSSxrwjondCVvBpMnJz8uJLRU=",
-      "dev": true
-    },
-    "js-queue": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/js-queue/-/js-queue-2.0.0.tgz",
-      "integrity": "sha1-NiITz4YPRo8BJfxslqvBdCUx+Ug=",
-      "dev": true,
-      "requires": {
-        "easy-stack": "^1.0.0"
-      }
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npm.taobao.org/js-tokens/download/js-tokens-4.0.0.tgz",
-      "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk=",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.13.1.tgz",
-      "integrity": "sha1-r/FRswv9+o5J4F2iLnQV6d+jeEc=",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/json-stable-stringify-without-jsonify/download/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
-    "json3": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
-      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
-      "dev": true
-    },
-    "json5": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
-      "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.0"
-      }
-    },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "killable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
-      "dev": true
-    },
-    "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-      "dev": true
-    },
-    "launch-editor": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.2.1.tgz",
-      "integrity": "sha512-On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.3.0",
-        "shell-quote": "^1.6.1"
-      }
-    },
-    "launch-editor-middleware": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.2.1.tgz",
-      "integrity": "sha512-s0UO2/gEGiCgei3/2UN3SMuUj1phjQN8lcpnvgLSz26fAzNWPQ6Nf/kF5IFClnfU2ehp6LrmKdMU/beveO+2jg==",
-      "dev": true,
-      "requires": {
-        "launch-editor": "^2.2.1"
-      }
-    },
-    "lcid": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^2.0.0"
-      }
-    },
-    "leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true
-    },
-    "levenary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-      "dev": true,
-      "requires": {
-        "leven": "^3.1.0"
-      }
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npm.taobao.org/levn/download/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
-    "lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-      "dev": true
-    },
-    "loader-fs-cache": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz",
-      "integrity": "sha512-70IzT/0/L+M20jUlEqZhZyArTU6VKLRTYRDAYN26g4jfzpJqjipLL3/hgYpySqI9PwsVRHHFja0LfEmsx9X2Cw==",
-      "dev": true,
-      "requires": {
-        "find-cache-dir": "^0.1.1",
-        "mkdirp": "0.5.1"
-      },
-      "dependencies": {
-        "find-cache-dir": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
-          "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "mkdirp": "^0.5.1",
-            "pkg-dir": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "dev": true,
-          "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "dev": true,
-          "requires": {
-            "pinkie-promise": "^2.0.0"
-          }
-        },
-        "pkg-dir": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-          "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-          "dev": true,
-          "requires": {
-            "find-up": "^1.0.0"
-          }
-        }
-      }
-    },
-    "loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-      "dev": true
-    },
-    "loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.2.3.tgz",
-      "integrity": "sha1-H/XcaRHJ8KBiUxpMBLYJQGEIwsc=",
-      "dev": true,
-      "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz",
-          "integrity": "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
-      }
-    },
-    "locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz",
-      "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=",
-      "dev": true
-    },
-    "lodash.defaultsdeep": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",
-      "integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==",
-      "dev": true
-    },
-    "lodash.kebabcase": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
-      "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=",
-      "dev": true
-    },
-    "lodash.mapvalues": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
-      "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=",
-      "dev": true
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-      "dev": true
-    },
-    "lodash.transform": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz",
-      "integrity": "sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A=",
-      "dev": true
-    },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
-    },
-    "log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.1"
-      }
-    },
-    "loglevel": {
-      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz",
-      "integrity": "sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==",
-      "dev": true
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "lower-case": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
-      "dev": true
-    },
-    "lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "requires": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "requires": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      }
-    },
-    "mamacro": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
-      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
-      "dev": true
-    },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dev": true,
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
-      "dev": true
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true
-    },
-    "mem": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-      "dev": true,
-      "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^2.0.0",
-        "p-is-promise": "^2.0.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-          "dev": true
-        }
-      }
-    },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-      "dev": true
-    },
-    "merge-source-map": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "merge2": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
-      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==",
-      "dev": true
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      }
-    },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      }
-    },
-    "mime": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
-      "dev": true
-    },
-    "mime-db": {
-      "version": "1.43.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
-      "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.26",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
-      "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.43.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-1.2.0.tgz",
-      "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
-      "dev": true
-    },
-    "mini-css-extract-plugin": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
-      "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.1.0",
-        "normalize-url": "1.9.1",
-        "schema-utils": "^1.0.0",
-        "webpack-sources": "^1.1.0"
-      },
-      "dependencies": {
-        "normalize-url": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-          "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-          "dev": true,
-          "requires": {
-            "object-assign": "^4.0.1",
-            "prepend-http": "^1.0.0",
-            "query-string": "^4.1.0",
-            "sort-keys": "^1.0.0"
-          }
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
-      }
-    },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz",
-      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-      "dev": true
-    },
-    "minipass": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
-      "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
-      "dev": true,
-      "requires": {
-        "yallist": "^4.0.0"
-      },
-      "dependencies": {
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
-      }
-    },
-    "minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "minipass-pipeline": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz",
-      "integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
-    "mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dev": true,
-      "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      }
-    },
-    "mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npm.taobao.org/mkdirp/download/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
-      }
-    },
-    "move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-      "dev": true,
-      "requires": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
-      }
-    },
-    "multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
-      "dev": true
-    },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-      "dev": true
-    },
-    "mz": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-      "dev": true,
-      "requires": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
-      }
-    },
-    "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
-      "dev": true,
-      "optional": true
-    },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      }
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
-      "dev": true
-    },
-    "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
-      "dev": true
-    },
-    "netmodular-module-admin": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/netmodular-module-admin/-/netmodular-module-admin-1.2.6.tgz",
-      "integrity": "sha512-bBfv4bLygMbN4+5X75PChv5TJaYR2mPaoQZRPb+K2AQQVAT6KmjlBVu4+DfH84285AsYfqlzYTx7fPxskQkBgQ==",
-      "requires": {
-        "netmodular-skins-classics": "^1.0.1",
-        "netmodular-ui": "^1.5.6"
-      }
-    },
-    "netmodular-skins-classics": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/netmodular-skins-classics/-/netmodular-skins-classics-1.0.1.tgz",
-      "integrity": "sha512-41ZaNE1TTvvtK6SNns9+hbhRpP7GIHmEBFOWx/TinikgK+FF7qEDrAZm3t2mqcIxQ84uXIVYSgG3OFNxnxIYYw==",
-      "requires": {
-        "netmodular-ui": "^1.2.7"
-      }
-    },
-    "netmodular-ui": {
-      "version": "1.5.9",
-      "resolved": "https://registry.npmjs.org/netmodular-ui/-/netmodular-ui-1.5.9.tgz",
-      "integrity": "sha512-78JQ3h3m5QvNqgc4dNvAkBp3wldkqwct5x6gJG6qmuNO/uC92tG6QkVNdo3sTyToISlnUnQ+1tKKrpCz9W78Vw==",
-      "requires": {
-        "@babel/polyfill": "^7.8.3",
-        "axios": "^0.19.2",
-        "codemirror": "^5.51.0",
-        "core-js": "^3.3.2",
-        "dayjs": "^1.8.20",
-        "echarts": "^4.6.0",
-        "element-ui": "^2.12.0",
-        "netmodular-ui-map": "^1.0.3",
-        "nprogress": "^0.2.0",
-        "qs": "^6.9.1",
-        "resize-observer-polyfill": "^1.5.1",
-        "screenfull": "^4.2.1",
-        "store": "^2.0.12",
-        "v-charts": "^1.19.0",
-        "vue": "^2.6.10",
-        "vue-clipboard2": "^0.3.1",
-        "vue-highlightjs": "^1.3.3",
-        "vue-router": "^3.1.5",
-        "vuedraggable": "^2.23.0",
-        "vuep": "^0.8.1",
-        "vuex": "^3.1.2"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz",
-          "integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA=="
-        }
-      }
-    },
-    "netmodular-ui-map": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/netmodular-ui-map/-/netmodular-ui-map-1.0.3.tgz",
-      "integrity": "sha512-dHsVqbyGw7giWRAPwyPNhTwk9l2jUKGEuphz2ASzvDRMLDjbRSDlK+R0kH5OkhHY44Udg/Xwxejo19HnY36NUA==",
-      "requires": {
-        "core-js": "^3.4.7",
-        "element-ui": "^2.13.0",
-        "netmodular-ui": "^1.2.6",
-        "vue": "^2.6.10",
-        "vue-router": "^3.1.3",
-        "vuex": "^3.0.1"
-      }
-    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz",
-      "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y=",
-      "dev": true
-    },
-    "no-case": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
-      "dev": true,
-      "requires": {
-        "lower-case": "^1.1.1"
-      }
-    },
-    "node-forge": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
-      "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
-      "dev": true
-    },
-    "node-ipc": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.1.tgz",
-      "integrity": "sha512-FAyICv0sIRJxVp3GW5fzgaf9jwwRQxAKDJlmNFUL5hOy+W4X/I5AypyHoq0DXXbo9o/gt79gj++4cMr4jVWE/w==",
-      "dev": true,
-      "requires": {
-        "event-pubsub": "4.3.0",
-        "js-message": "1.0.5",
-        "js-queue": "2.0.0"
-      }
-    },
-    "node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
-      }
-    },
-    "node-releases": {
-      "version": "1.1.50",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz",
-      "integrity": "sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
-    },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true
-    },
-    "normalize-url": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
-      "dev": true
-    },
-    "normalize-wheel": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dev": true,
-      "requires": {
-        "path-key": "^2.0.0"
-      }
-    },
-    "nprogress": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
-      "integrity": "sha1-y480xTIT2JVyP8urkH6UIq28r7E="
-    },
-    "nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-      "dev": true,
-      "requires": {
-        "boolbase": "~1.0.0"
-      }
-    },
-    "num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
-    "numerify": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/numerify/-/numerify-1.2.9.tgz",
-      "integrity": "sha512-X4QzQiytV5ZN3TVLhzbtFzjTarUNnaa1pgNDFqt7u7Nqhxe7FvY2eYrGt4WYHlYXDqgtfC/n/a5nJ2y0LijV8w=="
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
-    },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "object-hash": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
-      "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==",
-      "dev": true
-    },
-    "object-inspect": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
-      "dev": true
-    },
-    "object-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz",
-      "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==",
-      "dev": true
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.0"
-      }
-    },
-    "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      }
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      }
-    },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      }
-    },
-    "obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npm.taobao.org/once/download/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/onetime/download/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^1.0.0"
-      }
-    },
-    "open": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
-      "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
-      "dev": true,
-      "requires": {
-        "is-wsl": "^1.1.0"
-      }
-    },
-    "opener": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz",
-      "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==",
-      "dev": true
-    },
-    "opn": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
-      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
-      "dev": true,
-      "requires": {
-        "is-wsl": "^1.1.0"
-      }
-    },
-    "optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npm.taobao.org/optionator/download/optionator-0.8.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Foptionator%2Fdownload%2Foptionator-0.8.3.tgz",
-      "integrity": "sha1-hPodA2/p08fiHZmIS2ARZ+yPtJU=",
-      "dev": true,
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      }
-    },
-    "ora": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
-      "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.2",
-        "cli-cursor": "^2.1.0",
-        "cli-spinners": "^2.0.0",
-        "log-symbols": "^2.2.0",
-        "strip-ansi": "^5.2.0",
-        "wcwidth": "^1.0.1"
-      },
-      "dependencies": {
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
-    "original": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
-      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
-      "dev": true,
-      "requires": {
-        "url-parse": "^1.4.3"
-      }
-    },
-    "os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "os-locale": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-      "dev": true,
-      "requires": {
-        "execa": "^1.0.0",
-        "lcid": "^2.0.0",
-        "mem": "^4.0.0"
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-      "dev": true
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
-    },
-    "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
-      "dev": true
-    },
-    "p-limit": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-      "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
-      "dev": true,
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^2.0.0"
-      }
-    },
-    "p-map": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
-      "dev": true,
-      "requires": {
-        "aggregate-error": "^3.0.0"
-      }
-    },
-    "p-retry": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
-      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
-      "dev": true,
-      "requires": {
-        "retry": "^0.12.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
-    "pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
-    },
-    "parallel-transform": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
-      "dev": true,
-      "requires": {
-        "cyclist": "^1.0.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
-    "param-case": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
-      "dev": true,
-      "requires": {
-        "no-case": "^2.2.0"
-      }
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/parent-module/download/parent-module-1.0.1.tgz",
-      "integrity": "sha1-aR0nCeeMefrjoVZiJFLQB2LKqqI=",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      },
-      "dependencies": {
-        "callsites": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npm.taobao.org/callsites/download/callsites-3.1.0.tgz",
-          "integrity": "sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M=",
-          "dev": true
-        }
-      }
-    },
-    "parse-asn1": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
-      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
-      "dev": true,
-      "requires": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "parse-json": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-      "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1",
-        "lines-and-columns": "^1.1.6"
-      }
-    },
-    "parse5": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
-      "dev": true
-    },
-    "parse5-htmlparser2-tree-adapter": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-5.1.1.tgz",
-      "integrity": "sha512-CF+TKjXqoqyDwHqBhFQ+3l5t83xYi6fVT1tQNg+Ye0JRLnTxWvIroCjEp1A0k4lneHNBGnICUf0cfYVYGEazqw==",
-      "dev": true,
-      "requires": {
-        "parse5": "^5.1.1"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
-    },
-    "path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npm.taobao.org/path-is-inside/download/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/path-key/download/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-      "dev": true
-    },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-      "dev": true
-    },
-    "path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "requires": {
-        "pify": "^3.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        }
-      }
-    },
-    "pbkdf2": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
-      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
-      "dev": true,
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
-    "pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dev": true,
-      "requires": {
-        "find-up": "^3.0.0"
-      }
-    },
-    "pnp-webpack-plugin": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
-      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
-      "dev": true,
-      "requires": {
-        "ts-pnp": "^1.1.6"
-      }
-    },
-    "portfinder": {
-      "version": "1.0.25",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
-      "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==",
-      "dev": true,
-      "requires": {
-        "async": "^2.6.2",
-        "debug": "^3.1.1",
-        "mkdirp": "^0.5.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
-    },
-    "postcss": {
-      "version": "7.0.27",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz",
-      "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-calc": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz",
-      "integrity": "sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.27",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
-    "postcss-colormin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "color": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-convert-values": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-discard-comments": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-duplicates": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-empty": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-discard-overridden": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-load-config": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
-      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "^5.0.0",
-        "import-cwd": "^2.0.0"
-      }
-    },
-    "postcss-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
-      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
-      }
-    },
-    "postcss-merge-longhand": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
-      "dev": true,
-      "requires": {
-        "css-color-names": "0.0.4",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "stylehacks": "^4.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-merge-rules": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "cssnano-util-same-parent": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0",
-        "vendors": "^1.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "dev": true,
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-minify-font-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-minify-gradients": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "is-color-stop": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-minify-params": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "browserslist": "^4.0.0",
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-minify-selectors": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "dev": true,
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "postcss-modules-extract-imports": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
-      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.5"
-      }
-    },
-    "postcss-modules-local-by-default": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz",
-      "integrity": "sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==",
-      "dev": true,
-      "requires": {
-        "icss-utils": "^4.1.1",
-        "postcss": "^7.0.16",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.0"
-      }
-    },
-    "postcss-modules-scope": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz",
-      "integrity": "sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.6",
-        "postcss-selector-parser": "^6.0.0"
-      }
-    },
-    "postcss-modules-values": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
-      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
-      "dev": true,
-      "requires": {
-        "icss-utils": "^4.0.0",
-        "postcss": "^7.0.6"
-      }
-    },
-    "postcss-normalize-charset": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-normalize-display-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-positions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-repeat-style": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-string": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-timing-functions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-unicode": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
-      "dev": true,
-      "requires": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-normalize-whitespace": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-ordered-values": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0"
-      }
-    },
-    "postcss-reduce-transforms": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-selector-parser": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
-      "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^3.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
-    },
-    "postcss-svgo": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
-      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
-      "dev": true,
-      "requires": {
-        "is-svg": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "svgo": "^1.0.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-unique-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "postcss": "^7.0.0",
-        "uniqs": "^2.0.0"
-      }
-    },
-    "postcss-value-parser": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz",
-      "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==",
-      "dev": true
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npm.taobao.org/prelude-ls/download/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
-    },
-    "prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true
-    },
-    "prettier": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npm.taobao.org/prettier/download/prettier-1.19.1.tgz",
-      "integrity": "sha1-99f1/4qc2HKnvkyhQglZVqYHl8s=",
-      "dev": true
-    },
-    "prettier-linter-helpers": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/prettier-linter-helpers/download/prettier-linter-helpers-1.0.0.tgz",
-      "integrity": "sha1-0j1B/hN1ZG3i0BBNNFSjAIgCz3s=",
-      "dev": true,
-      "requires": {
-        "fast-diff": "^1.1.2"
-      }
-    },
-    "pretty-error": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
-      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
-      "dev": true,
-      "requires": {
-        "renderkid": "^2.0.1",
-        "utila": "~0.4"
-      }
-    },
-    "private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-      "dev": true
-    },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npm.taobao.org/progress/download/progress-2.0.3.tgz",
-      "integrity": "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg=",
-      "dev": true
-    },
-    "promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
-      "dev": true
-    },
-    "proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
-      "dev": true,
-      "requires": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.1"
-      }
-    },
-    "prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true
-    },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true
-    },
-    "psl": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz",
-      "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==",
-      "dev": true
-    },
-    "public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
-      }
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz",
-      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
-      "dev": true
-    },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
-    },
-    "query-string": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4.1.0",
-        "strict-uri-encode": "^1.0.0"
-      }
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "dev": true
-    },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true
-    },
-    "querystringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
-      "dev": true
-    },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
-    },
-    "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      }
-    },
-    "raw-loader": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npm.taobao.org/raw-loader/download/raw-loader-3.1.0.tgz",
-      "integrity": "sha1-Xp05mloiLMDeGPQsO8XklndTKz8=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^2.0.1"
-      }
-    },
-    "read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dev": true,
-      "requires": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "regenerate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
-      "dev": true
-    },
-    "regenerate-unicode-properties": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
-      "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
-      "dev": true,
-      "requires": {
-        "regenerate": "^1.4.0"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
-    },
-    "regenerator-transform": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz",
-      "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==",
-      "dev": true,
-      "requires": {
-        "private": "^0.1.6"
-      }
-    },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "regexp.prototype.flags": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
-      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      }
-    },
-    "regexpp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/regexpp/download/regexpp-2.0.1.tgz",
-      "integrity": "sha1-jRnTHPYySCtYkEn4KB+T28uk0H8=",
-      "dev": true
-    },
-    "regexpu-core": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
-      "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
-      "dev": true,
-      "requires": {
-        "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.1.0",
-        "regjsgen": "^0.5.0",
-        "regjsparser": "^0.6.0",
-        "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.1.0"
-      }
-    },
-    "regjsgen": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz",
-      "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==",
-      "dev": true
-    },
-    "regjsparser": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.3.tgz",
-      "integrity": "sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA==",
-      "dev": true,
-      "requires": {
-        "jsesc": "~0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        }
-      }
-    },
-    "relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-      "dev": true
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
-    },
-    "renderkid": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
-      "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
-      "dev": true,
-      "requires": {
-        "css-select": "^1.1.0",
-        "dom-converter": "^0.2",
-        "htmlparser2": "^3.3.0",
-        "strip-ansi": "^3.0.0",
-        "utila": "^0.4.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "css-select": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-          "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-          "dev": true,
-          "requires": {
-            "boolbase": "~1.0.0",
-            "css-what": "2.1",
-            "domutils": "1.5.1",
-            "nth-check": "~1.0.1"
-          }
-        },
-        "css-what": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
-          "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
-          "dev": true
-        },
-        "domutils": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-          "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-          "dev": true,
-          "requires": {
-            "dom-serializer": "0",
-            "domelementtype": "1"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
-      }
-    },
-    "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "dev": true
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      }
-    },
-    "request-promise-core": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
-      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.15"
-      }
-    },
-    "request-promise-native": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
-      "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
-      "dev": true,
-      "requires": {
-        "request-promise-core": "1.1.3",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
-    },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
-    "resize-observer-polyfill": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
-    },
-    "resolve": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
-      "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
-      "dev": true,
-      "requires": {
-        "path-parse": "^1.0.6"
-      }
-    },
-    "resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "dev": true
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
-    },
-    "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/restore-cursor/download/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "dev": true,
-      "requires": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-      "dev": true
-    },
-    "rgb-regex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
-      "dev": true
-    },
-    "rgba-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npm.taobao.org/run-async/download/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "dev": true,
-      "requires": {
-        "is-promise": "^2.1.0"
-      }
-    },
-    "run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1"
-      }
-    },
-    "rxjs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npm.taobao.org/rxjs/download/rxjs-6.5.3.tgz",
-      "integrity": "sha1-UQ4mMX9NuRp+sd532d2boKSJmjo=",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz",
-      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
-      "dev": true
-    },
-    "sass": {
-      "version": "1.26.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.2.tgz",
-      "integrity": "sha512-9TRp1d1NH0mWH8rqaR/jCS05f/TFD1ykPF2zSYviprMhLb0EmXVqtKMUHsvDt3YIT/jbSK6qAvUlfCW/HJkdCw==",
-      "dev": true,
-      "requires": {
-        "chokidar": ">=2.0.0 <4.0.0"
-      }
-    },
-    "sass-loader": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
-      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
-      "dev": true,
-      "requires": {
-        "clone-deep": "^4.0.1",
-        "loader-utils": "^1.2.3",
-        "neo-async": "^2.6.1",
-        "schema-utils": "^2.6.1",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "schema-utils": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.6.1.tgz",
-      "integrity": "sha1-63jwuUXHvPoggrNWXo2zVIAR3E8=",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.10.2",
-        "ajv-keywords": "^3.4.1"
-      }
-    },
-    "screenfull": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-4.2.1.tgz",
-      "integrity": "sha512-PLSp6f5XdhvjCCCO8OjavRfzkSGL3Qmdm7P82bxyU8HDDDBhDV3UckRaYcRa/NDNTYt8YBpzjoLWHUAejmOjLg=="
-    },
-    "select": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
-      "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
-    },
-    "select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
-      "dev": true
-    },
-    "selfsigned": {
-      "version": "1.10.7",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
-      "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
-      "dev": true,
-      "requires": {
-        "node-forge": "0.9.0"
-      }
-    },
-    "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz",
-      "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
-      "dev": true
-    },
-    "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-              "dev": true
-            }
-          }
-        },
-        "mime": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        }
-      }
-    },
-    "serialize-javascript": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
-      "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
-      "dev": true
-    },
-    "serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-          "dev": true,
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-          "dev": true
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-      "dev": true,
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      }
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
-      "dev": true
-    },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.2"
-      }
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/shebang-command/download/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/shebang-regex/download/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true
-    },
-    "shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
-      "dev": true
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
-    },
-    "simple-assign": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/simple-assign/-/simple-assign-0.1.0.tgz",
-      "integrity": "sha1-F/0wZqXz13OPUDIbsPFMooHMS6o="
-    },
-    "simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.3.1"
-      },
-      "dependencies": {
-        "is-arrayish": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-          "dev": true
-        }
-      }
-    },
-    "slash": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-      "dev": true
-    },
-    "slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/slice-ansi/download/slice-ansi-2.1.0.tgz",
-      "integrity": "sha1-ys12k0YaY3pXiNkqfdT7oGjoFjY=",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
-      }
-    },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "sockjs": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
-      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
-      "dev": true,
-      "requires": {
-        "faye-websocket": "^0.10.0",
-        "uuid": "^3.0.1"
-      }
-    },
-    "sockjs-client": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
-      "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.5",
-        "eventsource": "^1.0.7",
-        "faye-websocket": "~0.11.1",
-        "inherits": "^2.0.3",
-        "json3": "^3.3.2",
-        "url-parse": "^1.4.3"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "faye-websocket": {
-          "version": "0.11.3",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
-          "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
-          "dev": true,
-          "requires": {
-            "websocket-driver": ">=0.5.1"
-          }
-        }
-      }
-    },
-    "sort-keys": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
-      "dev": true,
-      "requires": {
-        "is-plain-obj": "^1.0.0"
-      }
-    },
-    "sortablejs": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
-      "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
-    },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
-    },
-    "source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "dev": true,
-      "requires": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "source-map-support": {
-      "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-      "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "dev": true
-    },
-    "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
-      "dev": true,
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
-      "dev": true
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-      "dev": true,
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-      "dev": true
-    },
-    "spdy": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
-      "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      }
-    },
-    "spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "dev": true,
-      "requires": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
-    "stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "dev": true
-    },
-    "stackframe": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.1.1.tgz",
-      "integrity": "sha512-0PlYhdKh6AfFxRyK/v+6/k+/mMfyiEBbTM5L94D0ZytQnJ166wuwoTYLHFWGbs2dpA8Rgq763KGWmN1EQEYHRQ==",
-      "dev": true
-    },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "dev": true
-    },
-    "stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-      "dev": true
-    },
-    "store": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/store/-/store-2.0.12.tgz",
-      "integrity": "sha1-jFNOKguDH3K3X8XxEZhXxE711ZM="
-    },
-    "stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
-    "strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-      "dev": true
-    },
-    "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz?cache=0&sync_timestamp=1573488535785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-2.1.1.tgz",
-      "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
-      "dev": true,
-      "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "string.prototype.trimleft": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
-      "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
-      }
-    },
-    "string.prototype.trimright": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
-      "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
-      }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^5.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        }
-      }
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true
-    },
-    "strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true
-    },
-    "strip-indent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-      "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
-      "dev": true
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/strip-json-comments/download/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
-    },
-    "stylehacks": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "dev": true,
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
-      }
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
-      "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
-      "dev": true,
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "svg-tags": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-      "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
-      "dev": true
-    },
-    "svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      }
-    },
-    "table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npm.taobao.org/table/download/table-5.4.6.tgz",
-      "integrity": "sha1-EpLRlQDOP4YFOwXw6Ofko7shB54=",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npm.taobao.org/emoji-regex/download/emoji-regex-7.0.3.tgz",
-          "integrity": "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-3.1.0.tgz?cache=0&sync_timestamp=1573488535785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-3.1.0.tgz",
-          "integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz",
-          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
-    "tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-      "dev": true
-    },
-    "terser": {
-      "version": "4.6.5",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.5.tgz",
-      "integrity": "sha512-LqajFf1pIGw6IeZmNuLa9Wq0Vu48wcPu3jEnuoIFx9KrW+tGuhc72Mi9ZDfbazzFtMOD9gifhmQdRxc4i4jfcg==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "terser-webpack-plugin": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz",
-      "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==",
-      "dev": true,
-      "requires": {
-        "cacache": "^12.0.2",
-        "find-cache-dir": "^2.1.0",
-        "is-wsl": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^2.1.2",
-        "source-map": "^0.6.1",
-        "terser": "^4.1.2",
-        "webpack-sources": "^1.4.0",
-        "worker-farm": "^1.7.0"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "thenify": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
-      "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
-      "dev": true,
-      "requires": {
-        "any-promise": "^1.0.0"
-      }
-    },
-    "thenify-all": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
-      "dev": true,
-      "requires": {
-        "thenify": ">= 3.1.0 < 4"
-      }
-    },
-    "thread-loader": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.3.tgz",
-      "integrity": "sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg==",
-      "dev": true,
-      "requires": {
-        "loader-runner": "^2.3.1",
-        "loader-utils": "^1.1.0",
-        "neo-async": "^2.6.0"
-      }
-    },
-    "throttle-debounce": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
-      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
-    },
-    "timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
-      "dev": true,
-      "requires": {
-        "setimmediate": "^1.0.4"
-      }
-    },
-    "timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
-      "dev": true
-    },
-    "tiny-emitter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz",
-      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      }
-    },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-      "dev": true
-    },
-    "toposort": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
-      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=",
-      "dev": true
-    },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
-    "tryer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
-      "dev": true
-    },
-    "ts-pnp": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.6.tgz",
-      "integrity": "sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ==",
-      "dev": true
-    },
-    "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npm.taobao.org/tslib/download/tslib-1.10.0.tgz",
-      "integrity": "sha1-w8GflZc/sKYpc/sJ2Q2WHuQ+XIo=",
-      "dev": true
-    },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npm.taobao.org/type-check/download/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2"
-      }
-    },
-    "type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-      "dev": true
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "uglify-js": {
-      "version": "3.4.10",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
-      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
-      "dev": true,
-      "requires": {
-        "commander": "~2.19.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.19.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "unicode-canonical-property-names-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
-      "dev": true
-    },
-    "unicode-match-property-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
-      "dev": true,
-      "requires": {
-        "unicode-canonical-property-names-ecmascript": "^1.0.4",
-        "unicode-property-aliases-ecmascript": "^1.0.4"
-      }
-    },
-    "unicode-match-property-value-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
-      "dev": true
-    },
-    "unicode-property-aliases-ecmascript": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
-      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
-      "dev": true
-    },
-    "union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      }
-    },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-      "dev": true
-    },
-    "uniqs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
-      "dev": true
-    },
-    "unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
-      "requires": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
-    },
-    "unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
-      "dev": true
-    },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
-        }
-      }
-    },
-    "upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true
-    },
-    "upper-case": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
-      "dev": true
-    },
-    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz",
-      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-          "dev": true
-        }
-      }
-    },
-    "url-loader": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.3.0.tgz",
-      "integrity": "sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.2.3",
-        "mime": "^2.4.4",
-        "schema-utils": "^2.5.0"
-      }
-    },
-    "url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
-      "dev": true,
-      "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
-    },
-    "util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        }
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      }
-    },
-    "utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
-      "dev": true
-    },
-    "utils-lite": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/utils-lite/-/utils-lite-0.1.10.tgz",
-      "integrity": "sha512-jlHvdtI8MyWURF/3u+ufIjf1Cs5WjN6WZl9qO8dEkZsVjaI7X5YMUhaCFzkvB69ljt6fo4Dd7V/Oj2NJOFDFOQ=="
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "dev": true
-    },
-    "v-charts": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/v-charts/-/v-charts-1.19.0.tgz",
-      "integrity": "sha512-vm2HBUmxAsXK0ivwce9LytcpqrItDA5JSPLYVxZXtiuoyhcn80XX1/3dPJd/1GqG1OYv3jfBo1s9ra4q8GowqA==",
-      "requires": {
-        "echarts-amap": "1.0.0-rc.6",
-        "echarts-liquidfill": "^2.0.2",
-        "echarts-wordcloud": "^1.1.3",
-        "numerify": "1.2.9",
-        "utils-lite": "0.1.10"
-      }
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "dev": true
-    },
-    "vendors": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
-      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
-      "dev": true
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
-    "vue": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
-      "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
-    },
-    "vue-clipboard2": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.1.tgz",
-      "integrity": "sha512-H5S/agEDj0kXjUb5GP2c0hCzIXWRBygaWLN3NEFsaI9I3uWin778SFEMt8QRXiPG+7anyjqWiw2lqcxWUSfkYg==",
-      "requires": {
-        "clipboard": "^2.0.0"
-      }
-    },
-    "vue-eslint-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-5.0.0.tgz",
-      "integrity": "sha1-APTk2pTsl0uCGib/DtD3p4QCuKE=",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "eslint-scope": "^4.0.0",
-        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^4.1.0",
-        "esquery": "^1.0.1",
-        "lodash": "^4.17.11"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz",
-          "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "espree": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/espree/download/espree-4.1.0.tgz",
-          "integrity": "sha1-co1UUeD9FWwEOEp62J7VH/VOsl8=",
-          "dev": true,
-          "requires": {
-            "acorn": "^6.0.2",
-            "acorn-jsx": "^5.0.0",
-            "eslint-visitor-keys": "^1.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
-          "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
-          "dev": true
-        }
-      }
-    },
-    "vue-highlightjs": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/vue-highlightjs/-/vue-highlightjs-1.3.3.tgz",
-      "integrity": "sha1-KaDVcTL8HOFc+mHolpGPW3GMXVI=",
-      "requires": {
-        "highlight.js": "*"
-      }
-    },
-    "vue-hot-reload-api": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
-      "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
-      "dev": true
-    },
-    "vue-loader": {
-      "version": "15.9.0",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.0.tgz",
-      "integrity": "sha512-FeDHvTSpwyLeF7LIV1PYkvqUQgTJ8UmOxhSlCyRSxaXCKk+M6NF4tDQsLsPPNeDPyR7TfRQ8MLg6v+8PsDV9xQ==",
-      "dev": true,
-      "requires": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
-      },
-      "dependencies": {
-        "hash-sum": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-          "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
-          "dev": true
-        }
-      }
-    },
-    "vue-router": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz",
-      "integrity": "sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA=="
-    },
-    "vue-style-loader": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
-      "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==",
-      "dev": true,
-      "requires": {
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.0.2"
-      },
-      "dependencies": {
-        "hash-sum": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-          "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
-          "dev": true
-        }
-      }
-    },
-    "vue-template-compiler": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.6.11.tgz",
-      "integrity": "sha1-wEcE749JixUxMAGJk+VjCdRpgIA=",
-      "dev": true,
-      "requires": {
-        "de-indent": "^1.0.2",
-        "he": "^1.1.0"
-      }
-    },
-    "vue-template-es2015-compiler": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
-      "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
-      "dev": true
-    },
-    "vuedraggable": {
-      "version": "2.23.2",
-      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.23.2.tgz",
-      "integrity": "sha512-PgHCjUpxEAEZJq36ys49HfQmXglattf/7ofOzUrW2/rRdG7tu6fK84ir14t1jYv4kdXewTEa2ieKEAhhEMdwkQ==",
-      "requires": {
-        "sortablejs": "^1.10.1"
-      }
-    },
-    "vuep": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/vuep/-/vuep-0.8.1.tgz",
-      "integrity": "sha512-D4ClmdZ37Itb57KdW9FPqE5820ENAFuJFmc7KyzGfoGBDhVHYxgF/pUbeTjpGe4VF0u2lGQVItfZ1xlh9nMpWg==",
-      "requires": {
-        "simple-assign": "^0.1.0"
-      }
-    },
-    "vuex": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.2.tgz",
-      "integrity": "sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ=="
-    },
-    "watchpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-      "dev": true,
-      "requires": {
-        "chokidar": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
-      }
-    },
-    "wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "requires": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "dev": true,
-      "requires": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "webpack": {
-      "version": "4.42.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz",
-      "integrity": "sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/wasm-edit": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "acorn": "^6.2.1",
-        "ajv": "^6.10.2",
-        "ajv-keywords": "^3.4.1",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.3",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.4.0",
-        "loader-utils": "^1.2.3",
-        "memory-fs": "^0.4.1",
-        "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.1",
-        "neo-async": "^2.6.1",
-        "node-libs-browser": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "tapable": "^1.1.3",
-        "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.6.0",
-        "webpack-sources": "^1.4.1"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
-      }
-    },
-    "webpack-bundle-analyzer": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz",
-      "integrity": "sha512-orUfvVYEfBMDXgEKAKVvab5iQ2wXneIEorGNsyuOyVYpjYrI7CUOhhXNDd3huMwQ3vNNWWlGP+hzflMFYNzi2g==",
-      "dev": true,
-      "requires": {
-        "acorn": "^6.0.7",
-        "acorn-walk": "^6.1.1",
-        "bfj": "^6.1.1",
-        "chalk": "^2.4.1",
-        "commander": "^2.18.0",
-        "ejs": "^2.6.1",
-        "express": "^4.16.3",
-        "filesize": "^3.6.1",
-        "gzip-size": "^5.0.0",
-        "lodash": "^4.17.15",
-        "mkdirp": "^0.5.1",
-        "opener": "^1.5.1",
-        "ws": "^6.0.0"
-      },
-      "dependencies": {
-        "acorn-walk": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
-          "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
-          "dev": true
-        }
-      }
-    },
-    "webpack-chain": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.4.0.tgz",
-      "integrity": "sha512-f97PYqxU+9/u0IUqp/ekAHRhBD1IQwhBv3wlJo2nvyELpr2vNnUqO3XQEk+qneg0uWGP54iciotszpjfnEExFA==",
-      "dev": true,
-      "requires": {
-        "deepmerge": "^1.5.2",
-        "javascript-stringify": "^2.0.1"
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
-      "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
-      "dev": true,
-      "requires": {
-        "memory-fs": "^0.4.1",
-        "mime": "^2.4.4",
-        "mkdirp": "^0.5.1",
-        "range-parser": "^1.2.1",
-        "webpack-log": "^2.0.0"
-      }
-    },
-    "webpack-dev-server": {
-      "version": "3.10.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz",
-      "integrity": "sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==",
-      "dev": true,
-      "requires": {
-        "ansi-html": "0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^2.1.8",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^1.6.0",
-        "debug": "^4.1.1",
-        "del": "^4.1.1",
-        "express": "^4.17.1",
-        "html-entities": "^1.2.1",
-        "http-proxy-middleware": "0.19.1",
-        "import-local": "^2.0.0",
-        "internal-ip": "^4.3.0",
-        "ip": "^1.1.5",
-        "is-absolute-url": "^3.0.3",
-        "killable": "^1.0.1",
-        "loglevel": "^1.6.6",
-        "opn": "^5.5.0",
-        "p-retry": "^3.0.1",
-        "portfinder": "^1.0.25",
-        "schema-utils": "^1.0.0",
-        "selfsigned": "^1.10.7",
-        "semver": "^6.3.0",
-        "serve-index": "^1.9.1",
-        "sockjs": "0.3.19",
-        "sockjs-client": "1.4.0",
-        "spdy": "^4.0.1",
-        "strip-ansi": "^3.0.1",
-        "supports-color": "^6.1.0",
-        "url": "^0.11.0",
-        "webpack-dev-middleware": "^3.7.2",
-        "webpack-log": "^2.0.0",
-        "ws": "^6.2.1",
-        "yargs": "12.0.5"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-          "dev": true
-        },
-        "is-absolute-url": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-          "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
-          }
-        },
-        "yargs": {
-          "version": "12.0.5",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^11.1.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
-      }
-    },
-    "webpack-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^3.0.0",
-        "uuid": "^3.3.2"
-      }
-    },
-    "webpack-merge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.15"
-      }
-    },
-    "webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "websocket-driver": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
-      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
-      "dev": true,
-      "requires": {
-        "http-parser-js": ">=0.4.0 <0.4.11",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
-      "dev": true
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwhich%2Fdownload%2Fwhich-1.3.1.tgz",
-      "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npm.taobao.org/word-wrap/download/word-wrap-1.2.3.tgz",
-      "integrity": "sha1-YQY29rH3A4kb00dxzLF/uTtHB5w=",
-      "dev": true
-    },
-    "worker-farm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "dev": true,
-      "requires": {
-        "errno": "~0.1.7"
-      }
-    },
-    "wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npm.taobao.org/write/download/write-1.0.3.tgz",
-      "integrity": "sha1-CADhRSO5I6OH5BUSPIZWFqrg9cM=",
-      "dev": true,
-      "requires": {
-        "mkdirp": "^0.5.1"
-      }
-    },
-    "ws": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-      "dev": true,
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
-    },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
-    },
-    "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-      "dev": true
-    },
-    "yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "yargs": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
-      "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
-      "dev": true,
-      "requires": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^16.1.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz",
-      "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "yorkie": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz",
-      "integrity": "sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw==",
-      "dev": true,
-      "requires": {
-        "execa": "^0.8.0",
-        "is-ci": "^1.0.10",
-        "normalize-path": "^1.0.0",
-        "strip-indent": "^2.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "0.8.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz",
-          "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "normalize-path": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
-          "integrity": "sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=",
-          "dev": true
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-          "dev": true
-        }
-      }
-    },
-    "zrender": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.2.0.tgz",
-      "integrity": "sha512-YJ9hxt5uFincYYU3KK31+Ce+B6PJmYYK0Q9fQ6jOUAoC/VHbe4kCKAPkxKeT7jGTxrK5wYu18R0TLGqj2zbEOA=="
-    }
-  }
-}

From cc768232d190f749b67fa409862f472f2dcb5157 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Wed, 4 Mar 2020 18:04:53 +0800
Subject: [PATCH 29/71] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                                 | 2 +-
 src/Library/Domain/Module/ModuleEntity.cs                 | 3 +++
 .../Default/T4/src/DirectoryBuildProps.Extend.cs          | 8 ++++++++
 .../Templates/Default/T4/src/DirectoryBuildProps.cs       | 8 ++++----
 .../Templates/Default/T4/src/DirectoryBuildProps.tt       | 8 ++++----
 src/WebHost/_modules/CodeGenerator/_module.json           | 2 +-
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 08d3ffc..3d5b825 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.6.4</Version>
+    <Version>1.6.5</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Domain/Module/ModuleEntity.cs b/src/Library/Domain/Module/ModuleEntity.cs
index 79fd6db..75519be 100644
--- a/src/Library/Domain/Module/ModuleEntity.cs
+++ b/src/Library/Domain/Module/ModuleEntity.cs
@@ -42,18 +42,21 @@ public partial class ModuleEntity : EntityBaseWithSoftDelete
         /// 公司单位
         /// </summary>
         [Nullable]
+        [Length(100)]
         public string Company { get; set; }
 
         /// <summary>
         /// 官方地址
         /// </summary>
         [Nullable]
+        [Length(300)]
         public string ProjectUrl { get; set; }
 
         /// <summary>
         /// 仓库地址
         /// </summary>
         [Nullable]
+        [Length(300)]
         public string RepositoryUrl { get; set; }
     }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs
index 2dcb876..0c91940 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.Extend.cs
@@ -7,11 +7,19 @@ public partial class DirectoryBuildProps : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
         private readonly string _prefix;
+        private readonly string _company;
+        private readonly string _copyright;
+        private readonly string _projectUrl;
+        private readonly string _repositoryUrl;
 
         public DirectoryBuildProps(TemplateBuildModel model)
         {
             _model = model;
             _prefix = model.Module.Prefix;
+            _company = model.Module.Company ?? "";
+            _copyright = model.Module.Copyright ?? "";
+            _projectUrl = model.Module.ProjectUrl ?? "";
+            _repositoryUrl = model.Module.RepositoryUrl ?? "";
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
index c8cb43f..8273f4e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
@@ -65,28 +65,28 @@ public virtual string TransformText()
     <Company>");
             
             #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Company));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_company));
             
             #line default
             #line hidden
             this.Write("</Company>\r\n    <Copyright>");
             
             #line 20 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Copyright));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_copyright));
             
             #line default
             #line hidden
             this.Write("</Copyright>\r\n    <PackageProjectUrl>");
             
             #line 21 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.ProjectUrl));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_projectUrl));
             
             #line default
             #line hidden
             this.Write("</PackageProjectUrl>\r\n    <RepositoryUrl>");
             
             #line 22 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.RepositoryUrl));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_repositoryUrl));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
index 6859323..8fb6050 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
@@ -16,9 +16,9 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <!--设置打包路径-->
     <PackageOutputPath>$(SolutionDir)\_packages</PackageOutputPath>
-    <Company><#= _model.Module.Company #></Company>
-    <Copyright><#= _model.Module.Copyright #></Copyright>
-    <PackageProjectUrl><#= _model.Module.ProjectUrl #></PackageProjectUrl>
-    <RepositoryUrl><#= _model.Module.RepositoryUrl #></RepositoryUrl>
+    <Company><#= _company #></Company>
+    <Copyright><#= _copyright #></Copyright>
+    <PackageProjectUrl><#= _projectUrl #></PackageProjectUrl>
+    <RepositoryUrl><#= _repositoryUrl #></RepositoryUrl>
   </PropertyGroup>
 </Project>
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index 0151233..095340a 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.4"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.5"}

From 8d40ebcf3d7f1144c52bb74f8a8c385d334691c0 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Wed, 4 Mar 2020 21:57:33 +0800
Subject: [PATCH 30/71] update

---
 CodeGenerator.sln                             |  9 ++++++
 src/Directory.Build.props                     |  2 +-
 .../ModuleService/ModuleService.cs            |  4 +--
 .../Infrastructure/NuGet/NugetHelper.cs       |  7 ++--
 .../Library/Infrastructure/Csproj.Extend.cs   |  3 ++
 .../T4/src/Library/Infrastructure/Csproj.cs   | 18 +++++++++--
 .../T4/src/Library/Infrastructure/Csproj.tt   |  4 +--
 .../_modules/CodeGenerator/_module.json       |  2 +-
 .../Infrastructure.Test.csproj                | 26 +++++++++++++++
 test/Infrastructure.Test/NugetHelperTest.cs   | 32 +++++++++++++++++++
 10 files changed, 94 insertions(+), 13 deletions(-)
 create mode 100644 test/Infrastructure.Test/Infrastructure.Test.csproj
 create mode 100644 test/Infrastructure.Test/NugetHelperTest.cs

diff --git a/CodeGenerator.sln b/CodeGenerator.sln
index 111b173..8367058 100644
--- a/CodeGenerator.sln
+++ b/CodeGenerator.sln
@@ -23,6 +23,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebHost", "src\WebHost\WebH
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application", "src\Library\Application\Application.csproj", "{792B8CBF-AB02-4A87-AB5E-A6CB8E9DE39C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8DF8B7CB-7E3C-485B-A2AA-FBBD837FD2DB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Infrastructure.Test", "test\Infrastructure.Test\Infrastructure.Test.csproj", "{6442C161-8D83-47DF-98CE-98CCE2706EA5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -49,6 +53,10 @@ Global
 		{792B8CBF-AB02-4A87-AB5E-A6CB8E9DE39C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{792B8CBF-AB02-4A87-AB5E-A6CB8E9DE39C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{792B8CBF-AB02-4A87-AB5E-A6CB8E9DE39C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6442C161-8D83-47DF-98CE-98CCE2706EA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6442C161-8D83-47DF-98CE-98CCE2706EA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6442C161-8D83-47DF-98CE-98CCE2706EA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6442C161-8D83-47DF-98CE-98CCE2706EA5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -60,6 +68,7 @@ Global
 		{C2D01E40-4038-4527-9AAF-323359CD5CF0} = {B4D3AF99-D551-4B7A-82F3-CE0950FCAA08}
 		{CEAE0B43-438D-4778-BF3A-8665246EF718} = {B4D3AF99-D551-4B7A-82F3-CE0950FCAA08}
 		{792B8CBF-AB02-4A87-AB5E-A6CB8E9DE39C} = {E58182FC-0950-453F-8C3A-ABCB477C8A28}
+		{6442C161-8D83-47DF-98CE-98CCE2706EA5} = {8DF8B7CB-7E3C-485B-A2AA-FBBD837FD2DB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1A6F430A-4015-48B1-BD5B-32C30485B34D}
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 3d5b825..5aaba3b 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.6.5</Version>
+    <Version>1.6.6</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/ModuleService/ModuleService.cs b/src/Library/Application/ModuleService/ModuleService.cs
index b71cfc4..6837f26 100644
--- a/src/Library/Application/ModuleService/ModuleService.cs
+++ b/src/Library/Application/ModuleService/ModuleService.cs
@@ -37,9 +37,9 @@ public class ModuleService : IModuleService
         private readonly IClassMethodRepository _classMethodRepository;
         private readonly CodeGeneratorDbContext _dbContext;
         private readonly CodeGeneratorOptions _codeGeneratorOptions;
-        private readonly NugetHelper _nugetHelper;
+        private readonly NuGetHelper _nugetHelper;
 
-        public ModuleService(IModuleRepository repository, IMapper mapper, IClassRepository classRepository, IPropertyRepository propertyRepository, IEnumRepository enumRepository, IEnumItemRepository enumItemRepository, IModelPropertyRepository modelPropertyRepository, IClassMethodRepository classMethodRepository, CodeGeneratorDbContext dbContext, CodeGeneratorOptions codeGeneratorOptions, NugetHelper nugetHelper)
+        public ModuleService(IModuleRepository repository, IMapper mapper, IClassRepository classRepository, IPropertyRepository propertyRepository, IEnumRepository enumRepository, IEnumItemRepository enumItemRepository, IModelPropertyRepository modelPropertyRepository, IClassMethodRepository classMethodRepository, CodeGeneratorDbContext dbContext, CodeGeneratorOptions codeGeneratorOptions, NuGetHelper nugetHelper)
         {
             _repository = repository;
             _mapper = mapper;
diff --git a/src/Library/Infrastructure/NuGet/NugetHelper.cs b/src/Library/Infrastructure/NuGet/NugetHelper.cs
index d762a91..9fcf1f7 100644
--- a/src/Library/Infrastructure/NuGet/NugetHelper.cs
+++ b/src/Library/Infrastructure/NuGet/NugetHelper.cs
@@ -4,7 +4,6 @@
 using System.Net.Http;
 using System.Reflection;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
 using NetModular.Lib.Utils.Core.Attributes;
 using NetModular.Lib.Utils.Core.Extensions;
 
@@ -14,18 +13,16 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.NuGet
     /// NuGet帮助类
     /// </summary>
     [Singleton]
-    public class NugetHelper
+    public class NuGetHelper
     {
         private const string QueryUrl = "https://azuresearch-usnc.nuget.org/query?q={0}&take=1";
         private readonly Dictionary<string, PropertyInfo> _infos = new Dictionary<string, PropertyInfo>();
         private readonly HttpClient _client;
-        private readonly ILogger _logger;
         private NuGetPackageVersions _versions;
         private DateTime _lastSearchTime = DateTime.Now;
 
-        public NugetHelper(CodeGeneratorOptions options, IHttpClientFactory clientFactory, ILogger<NugetHelper> logger)
+        public NuGetHelper(CodeGeneratorOptions options, IHttpClientFactory clientFactory)
         {
-            _logger = logger;
             _client = clientFactory.CreateClient();
 
             var properties = typeof(NuGetPackageVersions).GetProperties();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs
index 6fd16fe..6520cbf 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.Extend.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using NetModular.Module.CodeGenerator.Infrastructure.NuGet;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Infrastructure
@@ -7,11 +8,13 @@ public partial class Csproj : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
         private readonly string _prefix;
+        private readonly NuGetPackageVersions _versions;
 
         public Csproj(TemplateBuildModel model)
         {
             _model = model;
             _prefix = model.Module.Prefix;
+            _versions = _model.NuGetPackageVersions;
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
index 5ec0646..a404f98 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
@@ -34,14 +34,28 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Options.Abstraction\" Version=\"1.7.1\" />\r\n    <PackageReference Include=\"");
+            this.Write(".Lib.Options.Abstraction\" Version=\"");
+            
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Options_Abstraction));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(@".Module.Admin.Domain"" Version=""1.7.1"" />
+            this.Write(".Module.Admin.Domain\" Version=\"");
+            
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Module_Admin_Domain));
+            
+            #line default
+            #line hidden
+            this.Write(@""" />
   </ItemGroup>
  
   <ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
index 5e8471c..f7df245 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Lib.Options.Abstraction" Version="1.7.1" />
-    <PackageReference Include="<#= _prefix #>.Module.Admin.Domain" Version="1.7.1" />
+    <PackageReference Include="<#= _prefix #>.Lib.Options.Abstraction" Version="<#= _versions.Lib_Options_Abstraction #>" />
+    <PackageReference Include="<#= _prefix #>.Module.Admin.Domain" Version="<#= _versions.Module_Admin_Domain #>" />
   </ItemGroup>
  
   <ItemGroup>
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index 095340a..b7a97ab 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.5"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.6"}
diff --git a/test/Infrastructure.Test/Infrastructure.Test.csproj b/test/Infrastructure.Test/Infrastructure.Test.csproj
new file mode 100644
index 0000000..bc3454c
--- /dev/null
+++ b/test/Infrastructure.Test/Infrastructure.Test.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="1.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Library\Infrastructure\Infrastructure.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/Infrastructure.Test/NugetHelperTest.cs b/test/Infrastructure.Test/NugetHelperTest.cs
new file mode 100644
index 0000000..eda283f
--- /dev/null
+++ b/test/Infrastructure.Test/NugetHelperTest.cs
@@ -0,0 +1,32 @@
+using Microsoft.Extensions.DependencyInjection;
+using NetModular.Lib.Utils.Core.SystemConfig;
+using NetModular.Module.CodeGenerator.Infrastructure;
+using NetModular.Module.CodeGenerator.Infrastructure.NuGet;
+using Xunit;
+
+namespace Infrastructure.Test
+{
+    public class NugetHelperTest
+    {
+        private readonly NuGetHelper _nuGetHelper;
+
+        public NugetHelperTest()
+        {
+            var service = new ServiceCollection();
+            service.AddHttpClient();
+            service.AddSingleton<SystemConfigModel>();
+            service.AddSingleton<CodeGeneratorOptions>();
+            service.AddSingleton<NuGetHelper>();
+            _nuGetHelper = service.BuildServiceProvider().GetService<NuGetHelper>();
+        }
+
+        [Fact]
+        public void GetVersionsTest()
+        {
+            var versions = _nuGetHelper.GetVersions();
+
+            Assert.NotNull(versions.Lib_Auth_Web);
+            Assert.NotNull(versions.Lib_Host_Web);
+        }
+    }
+}

From 8d891369a6b3ebd16ea319fbcb1d1082564c7536 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Sun, 8 Mar 2020 12:03:49 +0800
Subject: [PATCH 31/71] update

---
 data/SQLite/Nm_Admin.db                       | Bin 167936 -> 176128 bytes
 src/Library/Application/Application.csproj    |   4 +-
 src/Library/Domain/Domain.csproj              |   6 +-
 .../Infrastructure/Infrastructure.csproj      |   4 +-
 src/UI/module-codegenerator/package.json      |   6 +-
 .../onlineModule/components/save/index.vue    |  73 -------------
 .../src/views/onlineModule/index/cols.js      |  44 --------
 .../src/views/onlineModule/index/index.vue    |  99 ------------------
 .../src/views/onlineModule/index/page.js      |  43 --------
 .../views/property/components/save/index.vue  |   6 +-
 .../src/views/property/index/index.vue        |   1 +
 src/Web/Web.csproj                            |   8 +-
 src/WebHost/Properties/launchSettings.json    |   4 +-
 src/WebHost/WebHost.csproj                    |  14 +--
 14 files changed, 29 insertions(+), 283 deletions(-)
 delete mode 100644 src/UI/module-codegenerator/src/views/onlineModule/components/save/index.vue
 delete mode 100644 src/UI/module-codegenerator/src/views/onlineModule/index/cols.js
 delete mode 100644 src/UI/module-codegenerator/src/views/onlineModule/index/index.vue
 delete mode 100644 src/UI/module-codegenerator/src/views/onlineModule/index/page.js

diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index ae59b912e5ff88766e0f45566af2f7b4af816a56..d3111167630f4ab942cb5bbb49159901e4786077 100644
GIT binary patch
literal 176128
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

literal 167936
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

diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 1413446..409b1a3 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.7.5" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.8.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 28d4ce9..799396c 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.7.5" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.7.5" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.7.5" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.8.0" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 76af7d5..8e94964 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" />
-    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.7.4" />
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.7.9" />
+    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.8.0" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.8.1" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/src/UI/module-codegenerator/package.json b/src/UI/module-codegenerator/package.json
index ef421b9..0e28198 100644
--- a/src/UI/module-codegenerator/package.json
+++ b/src/UI/module-codegenerator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netmodular-module-codegenerator",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "Oldli",
   "license": "ISC",
   "code": "codeGenerator",
@@ -18,8 +18,8 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.2.6",
-    "netmodular-ui": "^1.5.9"
+    "netmodular-module-admin": "^1.2.9",
+    "netmodular-ui": "^1.6.4"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.2.3",
diff --git a/src/UI/module-codegenerator/src/views/onlineModule/components/save/index.vue b/src/UI/module-codegenerator/src/views/onlineModule/components/save/index.vue
deleted file mode 100644
index f630de7..0000000
--- a/src/UI/module-codegenerator/src/views/onlineModule/components/save/index.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
-  <nm-form-dialog ref="form" v-bind="form" v-on="on" :visible.sync="visible_">
-    <el-row>
-      <el-col :span="20" :offset="1">
-        <el-form-item label="名称：" prop="name">
-          <el-input v-model="form.model.name" clearable />
-        </el-form-item>
-        <el-form-item label="编码：" prop="code">
-          <el-input v-model="form.model.code" clearable />
-        </el-form-item>
-        <el-form-item label="图标：" prop="icon">
-          <el-input v-model="form.model.icon" clearable />
-        </el-form-item>
-        <el-form-item label="介绍说明：" prop="description">
-          <el-input v-model="form.model.description" clearable />
-        </el-form-item>
-        <el-form-item label="NuGet包ID：" prop="nuGetId">
-          <el-input v-model="form.model.nuGetId" clearable />
-        </el-form-item>
-        <el-form-item label="NPM包ID：" prop="npmId">
-          <el-input v-model="form.model.npmId" clearable />
-        </el-form-item>
-        <el-form-item label="公司名称：" prop="company">
-          <el-input v-model="form.model.company" clearable />
-        </el-form-item>
-        <el-form-item label="项目地址：" prop="projectUrl">
-          <el-input v-model="form.model.projectUrl" clearable />
-        </el-form-item>
-        <el-form-item label="仓库地址：" prop="repositoryUrl">
-          <el-input v-model="form.model.repositoryUrl" clearable />
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </nm-form-dialog>
-</template>
-<script>
-import { mixins } from 'netmodular-ui'
-
-const { add, edit, update } = $api.codeGenerator.onlineModule
-
-export default {
-  mixins: [mixins.formSave],
-  data() {
-    return {
-      title: '在线模块',
-      actions: { add, edit, update },
-      form: {
-        model: {
-          /** 名称 */
-          name: '',
-          /** 编码 */
-          code: '',
-          /** 图标 */
-          icon: '',
-          /** 介绍说明 */
-          description: '',
-          /** NuGet包ID */
-          nuGetId: '',
-          /** NPM包ID */
-          npmId: '',
-          /** 公司名称 */
-          company: '',
-          /** 项目地址 */
-          projectUrl: '',
-          /** 仓库地址 */
-          repositoryUrl: ''
-        },
-        rules: {}
-      }
-    }
-  }
-}
-</script>
diff --git a/src/UI/module-codegenerator/src/views/onlineModule/index/cols.js b/src/UI/module-codegenerator/src/views/onlineModule/index/cols.js
deleted file mode 100644
index 0628b1f..0000000
--- a/src/UI/module-codegenerator/src/views/onlineModule/index/cols.js
+++ /dev/null
@@ -1,44 +0,0 @@
-export default [
-  {
-    name: 'id',
-    label: '编号',
-    width: 250,
-    show: false
-  },
-  {
-    name: 'name',
-    label: '名称'
-  },
-  {
-    name: 'code',
-    label: '编码'
-  },
-  {
-    name: 'icon',
-    label: '图标'
-  },
-  {
-    name: 'description',
-    label: '介绍说明'
-  },
-  {
-    name: 'nuGetId',
-    label: 'NuGet包ID'
-  },
-  {
-    name: 'npmId',
-    label: 'NPM包ID'
-  },
-  {
-    name: 'company',
-    label: '公司名称'
-  },
-  {
-    name: 'projectUrl',
-    label: '项目地址'
-  },
-  {
-    name: 'repositoryUrl',
-    label: '仓库地址'
-  }
-]
diff --git a/src/UI/module-codegenerator/src/views/onlineModule/index/index.vue b/src/UI/module-codegenerator/src/views/onlineModule/index/index.vue
deleted file mode 100644
index c8eec2d..0000000
--- a/src/UI/module-codegenerator/src/views/onlineModule/index/index.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-  <nm-container>
-    <nm-list ref="list" v-bind="list">
-      <!--查询条件-->
-      <template v-slot:querybar>
-        <el-form-item label="名称：" prop="name">
-          <el-input v-model="list.model.name" clearable />
-        </el-form-item>
-        <el-form-item label="编码：" prop="code">
-          <el-input v-model="list.model.code" clearable />
-        </el-form-item>
-        <el-form-item label="图标：" prop="icon">
-          <el-input v-model="list.model.icon" clearable />
-        </el-form-item>
-        <el-form-item label="介绍说明：" prop="description">
-          <el-input v-model="list.model.description" clearable />
-        </el-form-item>
-        <el-form-item label="NuGet包ID：" prop="nuGetId">
-          <el-input v-model="list.model.nuGetId" clearable />
-        </el-form-item>
-        <el-form-item label="NPM包ID：" prop="npmId">
-          <el-input v-model="list.model.npmId" clearable />
-        </el-form-item>
-        <el-form-item label="公司名称：" prop="company">
-          <el-input v-model="list.model.company" clearable />
-        </el-form-item>
-        <el-form-item label="项目地址：" prop="projectUrl">
-          <el-input v-model="list.model.projectUrl" clearable />
-        </el-form-item>
-        <el-form-item label="仓库地址：" prop="repositoryUrl">
-          <el-input v-model="list.model.repositoryUrl" clearable />
-        </el-form-item>
-      </template>
-
-      <!--按钮-->
-      <template v-slot:querybar-buttons>
-        <nm-button-has :options="buttons.add" @click="add" />
-      </template>
-
-      <!--自定义列-->
-      <!-- <template v-slot:col-name="{row}">
-        <nm-button :text="row.name" type="text" />
-      </template> -->
-
-      <!--操作列-->
-      <template v-slot:col-operation="{ row }">
-        <nm-button v-bind="buttons.edit" @click="edit(row)" />
-        <nm-button-delete v-bind="buttons.del" :id="row.id" :action="removeAction" @success="refresh" />
-      </template>
-    </nm-list>
-
-    <save-page :id="curr.id" :visible.sync="dialog.save" @success="refresh" />
-  </nm-container>
-</template>
-<script>
-import { mixins } from 'netmodular-ui'
-import page from './page'
-import cols from './cols'
-import SavePage from '../components/save'
-
-const api = $api.codeGenerator.onlineModule
-
-export default {
-  name: page.name,
-  mixins: [mixins.list],
-  components: { SavePage },
-  data() {
-    return {
-      list: {
-        title: page.title,
-        cols,
-        action: api.query,
-        model: {
-          /** 名称 */
-          name: '',
-          /** 编码 */
-          code: '',
-          /** 图标 */
-          icon: '',
-          /** 介绍说明 */
-          description: '',
-          /** NuGet包ID */
-          nuGetId: '',
-          /** NPM包ID */
-          npmId: '',
-          /** 公司名称 */
-          company: '',
-          /** 项目地址 */
-          projectUrl: '',
-          /** 仓库地址 */
-          repositoryUrl: ''
-        }
-      },
-      removeAction: api.remove,
-      buttons: page.buttons
-    }
-  }
-}
-</script>
diff --git a/src/UI/module-codegenerator/src/views/onlineModule/index/page.js b/src/UI/module-codegenerator/src/views/onlineModule/index/page.js
deleted file mode 100644
index c18ed1a..0000000
--- a/src/UI/module-codegenerator/src/views/onlineModule/index/page.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/** 页面信息 */
-const page = new (function() {
-  this.title = '在线模块'
-  this.icon = 'app'
-  this.name = 'codegenerator_onlinemodule'
-  this.path = '/codegenerator/onlinemodule'
-
-  // 关联权限
-  this.permissions = [`${this.name}_query_get`]
-
-  // 按钮
-  this.buttons = {
-    add: {
-      text: '添加',
-      type: 'success',
-      icon: 'add',
-      code: `${this.name}_add`,
-      permissions: [`${this.name}_add_post`]
-    },
-    edit: {
-      text: '编辑',
-      type: 'text',
-      icon: 'edit',
-      code: `${this.name}_edit`,
-      permissions: [`${this.name}_edit_get`, `${this.name}_update_post`]
-    },
-    del: {
-      text: '删除',
-      type: 'text',
-      icon: 'delete',
-      code: `${this.name}_del`,
-      permissions: [`${this.name}_delete_delete`]
-    }
-  }
-})()
-
-/** 路由信息 */
-export const route = {
-  page,
-  component: () => import(/* webpackChunkName: "CodeGenerator.OnlineModule" */ './index')
-}
-
-export default page
diff --git a/src/UI/module-codegenerator/src/views/property/components/save/index.vue b/src/UI/module-codegenerator/src/views/property/components/save/index.vue
index 87d67b2..3a55a06 100644
--- a/src/UI/module-codegenerator/src/views/property/components/save/index.vue
+++ b/src/UI/module-codegenerator/src/views/property/components/save/index.vue
@@ -11,7 +11,10 @@
         <el-form-item label="类型：" prop="type">
           <type-select v-model="form.model.type" />
         </el-form-item>
-        <el-form-item v-show="showLength" label="长度：" prop="length">
+        <el-form-item v-show="showLength" prop="length">
+          <template v-slot:label>
+            <el-tooltip effect="dark" content="0标识最大长度，比如SqlServer就是nvarchar(MAX)" placement="top"> <nm-icon name="question" class="nm-size-20 nm-text-warning"/></el-tooltip> 长度</template
+          >
           <el-input v-model.number="form.model.length" />
         </el-form-item>
         <el-form-item v-show="showPrecision" label="精度：" prop="precision">
@@ -173,7 +176,6 @@ export default {
     }
   },
   props: {
-    total: Number,
     parent: {
       type: Object,
       required: true
diff --git a/src/UI/module-codegenerator/src/views/property/index/index.vue b/src/UI/module-codegenerator/src/views/property/index/index.vue
index 28786d2..bd2874c 100644
--- a/src/UI/module-codegenerator/src/views/property/index/index.vue
+++ b/src/UI/module-codegenerator/src/views/property/index/index.vue
@@ -93,6 +93,7 @@ export default {
     },
     add(total) {
       this.total = total
+      this.curr.id = ''
       this.dialog.save = true
     },
     edit(row) {
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 214fdb4..6e7a501 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.7.3" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.7.5" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.7.2" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.8.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/Properties/launchSettings.json b/src/WebHost/Properties/launchSettings.json
index 6c7a1f8..3c02b3e 100644
--- a/src/WebHost/Properties/launchSettings.json
+++ b/src/WebHost/Properties/launchSettings.json
@@ -1,12 +1,14 @@
 {
+  "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
     "WebHost": {
       "commandName": "Project",
       "launchBrowser": true,
+      "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://localhost:6222/swagger"
+      "applicationUrl": "http://localhost:6222"
     }
   }
 }
\ No newline at end of file
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index ed45747..6d98b8e 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.7.5" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.7.5" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.7.5" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.7.2" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.7.7" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.7.9" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.8.0" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.8.1" />
   </ItemGroup>
 
   <ItemGroup>

From f5369959c64834a90e73b74c233d99440423dd9c Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Wed, 11 Mar 2020 20:38:58 +0800
Subject: [PATCH 32/71] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AF=E7=A9=BA?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=94=9F=E6=88=90=E6=97=B6=E9=97=AE=E5=8F=B7?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=B8=8D=E5=AF=B9=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                                   | 2 +-
 src/Library/Infrastructure/Infrastructure.csproj            | 2 +-
 .../Templates/Default/T4/src/Library/Domain/Entity.cs       | 6 +++---
 .../Templates/Default/T4/src/Library/Domain/Entity.tt       | 2 +-
 src/WebHost/WebHost.csproj                                  | 4 ++--
 src/WebHost/_modules/CodeGenerator/_module.json             | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 5aaba3b..b903fc9 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.6.6</Version>
+    <Version>1.6.7</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 8e94964..fecff8b 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" />
     <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.8.0" />
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.8.1" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.8.5" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.cs
index d76b2b0..f5ff122 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.cs
@@ -205,16 +205,16 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(" ");
             
             #line 37 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(p.Name));
+            this.Write(this.ToStringHelper.ToStringWithCulture(p.Nullable && p.Type != PropertyType.String ? "?" : ""));
             
             #line default
             #line hidden
+            this.Write(" ");
             
             #line 37 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Entity.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(p.Nullable && p.Type != PropertyType.String ? "?" : ""));
+            this.Write(this.ToStringHelper.ToStringWithCulture(p.Name));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.tt
index 327a996..d8310c2 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Entity.tt
@@ -34,7 +34,7 @@ namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name
 <# if(p.Type == PropertyType.Decimal||p.Type == PropertyType.Double){ #>
 		[Precision]
 <# } #>
-        public <#= p.Type == PropertyType.Enum ? p.Enum.Name : p.Type.ToDescription() #> <#= p.Name #><#= p.Nullable && p.Type != PropertyType.String ? "?" : "" #> { get; set; }<#= GetDefaultValue(p) #>
+        public <#= p.Type == PropertyType.Enum ? p.Enum.Name : p.Type.ToDescription() #><#= p.Nullable && p.Type != PropertyType.String ? "?" : "" #> <#= p.Name #> { get; set; }<#= GetDefaultValue(p) #>
 
 <# } #>
     }
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 6d98b8e..4aa28d1 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -14,8 +14,8 @@
     <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.8.0" />
     <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.8.0" />
     <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.8.0" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.8.0" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.8.1" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.8.2" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.8.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index b7a97ab..824d4f8 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.6"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.7"}

From c127aa0ddb1191c976b7f7740e1d777ff3eee712 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Wed, 11 Mar 2020 20:44:42 +0800
Subject: [PATCH 33/71] update

---
 src/Directory.Build.props                     |  2 +-
 .../T4/src/Library/Application/Csproj.cs      | 19 +++++++++++++++++--
 .../T4/src/Library/Application/Csproj.tt      |  8 ++++++++
 .../T4/src/Library/Infrastructure/Csproj.cs   | 19 ++-----------------
 .../T4/src/Library/Infrastructure/Csproj.tt   |  8 --------
 .../_modules/CodeGenerator/_module.json       |  2 +-
 6 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b903fc9..8382360 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.6.7</Version>
+    <Version>1.6.8</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
index 9b5c888..aa6525f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
@@ -55,8 +55,23 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("\" />\r\n  </ItemGroup>\r\n\r\n  <ItemGroup>\r\n    <ProjectReference Include=\"..\\Infrastr" +
-                    "ucture\\Infrastructure.csproj\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n");
+            this.Write(@""" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include=""..\Infrastructure\Infrastructure.csproj"" />
+  </ItemGroup>
+    
+  <!--打包模块相关文件到NuGet包中，此功能需要编译两次项目才行，因为打包操作在创建_module.json文件之前执行的-->
+  <ItemGroup>
+    <Content Include=""$(SolutionDir)\src\WebHost\_modules*\**\*.*"" PackagePath=""contentFiles\any\any"">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+    </Content>
+  </ItemGroup>
+
+</Project>
+");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
index cd02138..2712c0f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
@@ -13,5 +13,13 @@
   <ItemGroup>
     <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
   </ItemGroup>
+    
+  <!--打包模块相关文件到NuGet包中，此功能需要编译两次项目才行，因为打包操作在创建_module.json文件之前执行的-->
+  <ItemGroup>
+    <Content Include="$(SolutionDir)\src\WebHost\_modules*\**\*.*" PackagePath="contentFiles\any\any">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+    </Content>
+  </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
index a404f98..a1196de 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
@@ -55,23 +55,8 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(@""" />
-  </ItemGroup>
- 
-  <ItemGroup>
-    <ProjectReference Include=""..\Domain\Domain.csproj"" />
-  </ItemGroup>
-  
-  <!--���ģ������ļ���NuGet���У��˹�����Ҫ����������Ŀ���У���Ϊ��������ڴ���_module.json�ļ�֮ǰִ�е�-->
-  <ItemGroup>
-    <Content Include=""$(SolutionDir)\src\WebHost\_modules*\**\*.*"" PackagePath=""contentFiles\any\any"">
-      <Pack>true</Pack>
-      <PackageCopyToOutput>true</PackageCopyToOutput>
-    </Content>
-  </ItemGroup>
-
-</Project>
-");
+            this.Write("\" />\r\n  </ItemGroup>\r\n \r\n  <ItemGroup>\r\n    <ProjectReference Include=\"..\\Domain\\" +
+                    "Domain.csproj\" />\r\n  </ItemGroup>\r\n\r\n</Project>\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
index f7df245..89ca607 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
@@ -13,13 +13,5 @@
   <ItemGroup>
     <ProjectReference Include="..\Domain\Domain.csproj" />
   </ItemGroup>
-  
-  <!--���ģ������ļ���NuGet���У��˹�����Ҫ����������Ŀ���У���Ϊ��������ڴ���_module.json�ļ�֮ǰִ�е�-->
-  <ItemGroup>
-    <Content Include="$(SolutionDir)\src\WebHost\_modules*\**\*.*" PackagePath="contentFiles\any\any">
-      <Pack>true</Pack>
-      <PackageCopyToOutput>true</PackageCopyToOutput>
-    </Content>
-  </ItemGroup>
 
 </Project>
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index 824d4f8..383e4f0 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.7"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.8"}

From d0553f668dae6a0bd825e8f53f73454f5717291d Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Thu, 12 Mar 2020 08:25:59 +0800
Subject: [PATCH 34/71] update

---
 .../Infrastructure/Infrastructure.csproj      | 10 ++++++
 .../src/Library/Domain/Models/QueryModel.cs   | 26 +++++++--------
 .../src/Library/Domain/Models/QueryModel.tt   |  2 +-
 .../T4/src/Library/Domain/Repository.cs       | 33 ++++++++-----------
 .../T4/src/Library/Domain/Repository.tt       |  1 -
 5 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index fecff8b..0054d07 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -744,6 +744,16 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Entity.tt</DependentUpon>
     </Compile>
+    <Compile Update="Templates\Default\T4\src\Library\Domain\Models\QueryModel.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>QueryModel.tt</DependentUpon>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\Library\Domain\Repository.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Repository.tt</DependentUpon>
+    </Compile>
     <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Csproj.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.cs
index 644bc77..7764d76 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.cs
@@ -17,7 +17,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class QueryModel : QueryModelBase
     {
@@ -29,76 +29,76 @@ public virtual string TransformText()
         {
             this.Write("using System;\r\nusing ");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Data.Query;\r\n\r\nnamespace  ");
+            this.Write(".Lib.Data.Query;\r\n\r\nnamespace ");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write(".Models\r\n{\r\n    public class ");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("QueryModel : QueryModel\r\n    {\r\n");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
   foreach(var property in _propertyList){ 
             
             #line default
             #line hidden
             this.Write("        /// <summary>\r\n        /// ");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Remarks));
             
             #line default
             #line hidden
             this.Write("\r\n        /// </summary>\r\n        public ");
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Type == PropertyType.Enum ? property.Enum.Name : property.Type.ToDescription()));
             
             #line default
             #line hidden
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Nullable && property.Type != PropertyType.String ? "?" : ""));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(property.Name));
             
             #line default
             #line hidden
             this.Write(" { get; set; }\r\n\r\n");
             
-            #line 17 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt"
  } 
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.tt
index 402513b..e991991 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Models/QueryModel.tt
@@ -4,7 +4,7 @@
 using System;
 using <#= _prefix #>.Lib.Data.Query;
 
-namespace  <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>.Models
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>.Models
 {
     public class <#= _class.Name #>QueryModel : QueryModel
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.cs
index 3f4f58d..c8fa8e3 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Repository : RepositoryBase
     {
@@ -27,77 +27,70 @@ public virtual string TransformText()
         {
             this.Write("using System.Collections.Generic;\r\nusing System.Threading.Tasks;\r\nusing ");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Abstractions;\r\nusing ");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
-            
-            #line default
-            #line hidden
-            this.Write(".Lib.Data.Abstractions.Pagination;\r\nusing ");
-            
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write(".Models;\r\n\r\nnamespace ");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("\r\n{\r\n    /// <summary>\r\n    /// ");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Remarks));
             
             #line default
             #line hidden
             this.Write("仓储\r\n    /// </summary>\r\n    public interface I");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Repository : IRepository<");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
@@ -106,14 +99,14 @@ public virtual string TransformText()
                     "      /// <param name=\"model\"></param>\r\n        /// <returns></returns>\r\n       " +
                     " Task<IList<");
             
-            #line 20 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Entity>> Query(");
             
-            #line 20 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Repository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.tt
index df872b8..159038c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Repository.tt
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using <#= _prefix #>.Lib.Data.Abstractions;
-using <#= _prefix #>.Lib.Data.Abstractions.Pagination;
 using <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>.Models;
 
 namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Domain.<#= _class.Name #>

From a4e3273dbe84d441b2533a7a861b05ecb3a5ac50 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Fri, 13 Mar 2020 10:58:53 +0800
Subject: [PATCH 35/71] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UI/module-codegenerator/package.json              |  6 +++---
 .../src/views/class/index/index.vue                   | 11 +++++++----
 .../src/views/enum/index/index.vue                    |  3 ++-
 .../src/views/module/index/index.vue                  |  4 +++-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/UI/module-codegenerator/package.json b/src/UI/module-codegenerator/package.json
index 0e28198..ee00664 100644
--- a/src/UI/module-codegenerator/package.json
+++ b/src/UI/module-codegenerator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netmodular-module-codegenerator",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "author": "Oldli",
   "license": "ISC",
   "code": "codeGenerator",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "netmodular-module-admin": "^1.2.9",
-    "netmodular-ui": "^1.6.4"
+    "netmodular-ui": "^1.6.6"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.2.3",
@@ -35,7 +35,7 @@
     "prettier": "^1.18.2",
     "raw-loader": "^3.1.0",
     "rimraf": "^3.0.2",
-    "sass": "^1.26.2",
+    "sass": "^1.26.3",
     "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/src/UI/module-codegenerator/src/views/class/index/index.vue b/src/UI/module-codegenerator/src/views/class/index/index.vue
index bda068c..301bfec 100644
--- a/src/UI/module-codegenerator/src/views/class/index/index.vue
+++ b/src/UI/module-codegenerator/src/views/class/index/index.vue
@@ -46,6 +46,7 @@ export default {
   components: { SavePage, PropertyPage, ModelManagePage, CodePreview },
   data() {
     return {
+      curr: { name: '' },
       list: {
         noHeader: true,
         queryOnCreated: false,
@@ -83,11 +84,13 @@ export default {
   methods: {
     /** 打开模型管理 */
     openModelManage(row) {
-      this.curr = row
+      this.curr.id = row.id
+      this.curr.name = row.name
       this.dialog.model = true
     },
     manageProperty(row) {
-      this.curr = row
+      this.curr.id = row.id
+      this.curr.name = row.name
       this.dialog.property = true
     },
     buildCode(row) {
@@ -102,7 +105,8 @@ export default {
         })
     },
     codePreview(row) {
-      this.curr = row
+      this.curr.id = row.id
+      this.curr.name = row.name
       this.dialog.codePreview = true
     },
     onOpen() {
@@ -111,7 +115,6 @@ export default {
       })
     },
     onReset() {
-      console.log(1)
       this.list.model.moduleId = this.module.id
       this.$refs.list.query()
     }
diff --git a/src/UI/module-codegenerator/src/views/enum/index/index.vue b/src/UI/module-codegenerator/src/views/enum/index/index.vue
index 3cceea3..8a017ee 100644
--- a/src/UI/module-codegenerator/src/views/enum/index/index.vue
+++ b/src/UI/module-codegenerator/src/views/enum/index/index.vue
@@ -64,7 +64,8 @@ export default {
   },
   methods: {
     manageItem(row) {
-      this.curr = row
+      this.curr.id = row.id
+      this.curr.name = row.name
       this.dialog.item = true
     }
   }
diff --git a/src/UI/module-codegenerator/src/views/module/index/index.vue b/src/UI/module-codegenerator/src/views/module/index/index.vue
index cdb871e..c7efd87 100644
--- a/src/UI/module-codegenerator/src/views/module/index/index.vue
+++ b/src/UI/module-codegenerator/src/views/module/index/index.vue
@@ -73,6 +73,7 @@ export default {
   components: { SavePage, ClassPage },
   data() {
     return {
+      curr: { name: '' },
       list: {
         title: page.title,
         cols,
@@ -102,7 +103,8 @@ export default {
         })
     },
     manageClass(row) {
-      this.curr = row
+      this.curr.id = row.id
+      this.curr.name = row.name
       this.dialog.class = true
     }
   }

From 151a2b8eeb3cf14d443440d75bca7a27ddd50577 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Sun, 15 Mar 2020 11:31:39 +0800
Subject: [PATCH 36/71] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=9F=A5=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UI/module-codegenerator/package.json           |  2 +-
 src/UI/module-codegenerator/src/config/index.js    |  2 +-
 .../views/modelProperty/components/add/index.vue   | 11 +++++++----
 .../views/modelProperty/components/list/index.vue  | 14 +++++++-------
 .../src/views/modelProperty/index/index.vue        | 13 +++++--------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/UI/module-codegenerator/package.json b/src/UI/module-codegenerator/package.json
index ee00664..50b213f 100644
--- a/src/UI/module-codegenerator/package.json
+++ b/src/UI/module-codegenerator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netmodular-module-codegenerator",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "author": "Oldli",
   "license": "ISC",
   "code": "codeGenerator",
diff --git a/src/UI/module-codegenerator/src/config/index.js b/src/UI/module-codegenerator/src/config/index.js
index 14da11b..f41427f 100644
--- a/src/UI/module-codegenerator/src/config/index.js
+++ b/src/UI/module-codegenerator/src/config/index.js
@@ -6,6 +6,6 @@ const config = {
 
 // 开发模式
 if (isDev) {
-  config.baseUrl = 'http://localhost:6222/api/'
+  config.baseUrl = 'https://api.demo.17mkh.com/api/'
 }
 export default config
diff --git a/src/UI/module-codegenerator/src/views/modelProperty/components/add/index.vue b/src/UI/module-codegenerator/src/views/modelProperty/components/add/index.vue
index cab2dbd..0c5e22f 100644
--- a/src/UI/module-codegenerator/src/views/modelProperty/components/add/index.vue
+++ b/src/UI/module-codegenerator/src/views/modelProperty/components/add/index.vue
@@ -76,7 +76,8 @@ export default {
       },
       on: {
         success: this.onSuccess,
-        open: this.onOpen
+        open: this.onOpen,
+        reset: this.onReset
       }
     }
   },
@@ -106,10 +107,12 @@ export default {
     onOpen() {
       this.$nextTick(() => {
         this.$refs.form.reset()
-        this.form.model.classId = this.parent.id
-        this.form.model.sort = this.total
-        this.form.model.modelType = this.modelType
       })
+    },
+    onReset() {
+      this.form.model.classId = this.parent.id
+      this.form.model.sort = this.total
+      this.form.model.modelType = this.modelType
     }
   },
   watch: {
diff --git a/src/UI/module-codegenerator/src/views/modelProperty/components/list/index.vue b/src/UI/module-codegenerator/src/views/modelProperty/components/list/index.vue
index dcebb5b..c114387 100644
--- a/src/UI/module-codegenerator/src/views/modelProperty/components/list/index.vue
+++ b/src/UI/module-codegenerator/src/views/modelProperty/components/list/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <nm-list ref="list" v-bind="list">
+  <nm-list ref="list" v-bind="list" style="border-top:none">
     <template v-slot:querybar-buttons="{ total }">
       <nm-button type="success" text="添加" icon="add" @click="add(total)" />
       <nm-button type="warning" text="排序" icon="sort" @click="openSort" />
@@ -89,9 +89,6 @@ export default {
     refresh() {
       this.$refs.list.refresh()
     },
-    reset() {
-      this.$refs.list.reset()
-    },
     add(total) {
       this.total = total
       this.dialog.add = true
@@ -117,9 +114,12 @@ export default {
     }
   },
   watch: {
-    parent(val) {
-      this.list.model.classId = val.id
-      this.refresh()
+    parent: {
+      deep: true,
+      handler(val) {
+        this.list.model.classId = val.id
+        this.refresh()
+      }
     },
     modelType(val) {
       this.list.model.modelType = val
diff --git a/src/UI/module-codegenerator/src/views/modelProperty/index/index.vue b/src/UI/module-codegenerator/src/views/modelProperty/index/index.vue
index ed6d799..32d5b2a 100644
--- a/src/UI/module-codegenerator/src/views/modelProperty/index/index.vue
+++ b/src/UI/module-codegenerator/src/views/modelProperty/index/index.vue
@@ -17,7 +17,7 @@
       </el-tabs>
     </div>
     <div class="bottom">
-      <list-page ref="list" :parent="parent" :model-type="modelType" @reset="onReset" />
+      <list-page ref="list" :parent="parent" :model-type="modelType" />
     </div>
   </nm-dialog>
 </template>
@@ -53,16 +53,13 @@ export default {
   },
   methods: {
     refresh() {
-      this.$refs.list.refresh()
-    },
-    onOpen() {
       this.$nextTick(() => {
-        this.active = 'query'
-        this.$refs.list.reset()
+        this.$refs.list.refresh()
       })
     },
-    onReset() {
-      this.$refs.list.refresh()
+    onOpen() {
+      this.active = 'query'
+      this.refresh()
     }
   }
 }

From cbb8000b03828eeb10e50da7c6fe44b88a2f5ada Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Thu, 19 Mar 2020 22:50:48 +0800
Subject: [PATCH 37/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7NuGet=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                          |  2 +-
 src/Library/Application/Application.csproj         |  2 +-
 src/Library/Domain/Domain.csproj                   |  6 +++---
 src/Library/Infrastructure/CodeGeneratorOptions.cs | 10 ++++++++++
 src/Library/Infrastructure/Infrastructure.csproj   |  4 ++--
 src/Web/Web.csproj                                 |  4 ++--
 src/WebHost/WebHost.csproj                         | 12 ++++++------
 src/WebHost/_modules/CodeGenerator/_module.json    |  2 +-
 8 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 8382360..cdf4768 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.6.8</Version>
+    <Version>1.6.9</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 409b1a3..a0c655c 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.8.1" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.8.0" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 799396c..1e244ff 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.8.0" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.8.0" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.8.1" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.8.1" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.8.2" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/CodeGeneratorOptions.cs b/src/Library/Infrastructure/CodeGeneratorOptions.cs
index 81fabca..c79d24f 100644
--- a/src/Library/Infrastructure/CodeGeneratorOptions.cs
+++ b/src/Library/Infrastructure/CodeGeneratorOptions.cs
@@ -48,5 +48,15 @@ public string BuildCodePath
         /// </summary>
         [ModuleOptionDefinition("前端组件前缀", "前端组件前缀，如Nm，组件名称就是nm-list")]
         public string UiPrefix { get; set; } = "Nm";
+
+        public IModuleOptions Copy()
+        {
+            return new CodeGeneratorOptions(_systemConfig)
+            {
+                BuildCodePath = BuildCodePath,
+                Prefix = Prefix,
+                UiPrefix = UiPrefix
+            };
+        }
     }
 }
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 0054d07..70673f3 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" />
-    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.8.0" />
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.8.5" />
+    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.8.2" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.8.8" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 6e7a501..5cd75a0 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -7,8 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.8.0" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.8.0" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.8.1" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.8.2" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.8.0" />
   </ItemGroup>
   
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 4aa28d1..4055486 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -10,12 +10,12 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.8.0" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.8.0" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.8.0" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.8.0" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.8.0" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.8.2" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.8.5" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.8.1" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.8.1" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.8.1" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.8.1" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.8.6" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.8.8" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index 383e4f0..9ce83bc 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.8"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.9"}

From f0715667367a84081db9ec0a36e762bf517359bc Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Thu, 19 Mar 2020 23:15:15 +0800
Subject: [PATCH 38/71] update

---
 data/SQLite/Nm_Admin.db | Bin 176128 -> 176128 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index d3111167630f4ab942cb5bbb49159901e4786077..fb1529cd47477efbe2524efc474103641bfad2b5 100644
GIT binary patch
delta 15748
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

delta 11893
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


From de524ecbaab883dbaec48d2160b86971edd331a1 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Fri, 20 Mar 2020 12:43:04 +0800
Subject: [PATCH 39/71] update

---
 src/Directory.Build.props                     |  2 +-
 .../Infrastructure/Infrastructure.csproj      | 55 +------------------
 .../T4/src/Library/Application/Csproj.cs      | 19 +------
 .../T4/src/Library/Application/Csproj.tt      |  8 ---
 src/WebHost/WebHost.csproj                    |  2 +-
 .../_modules/CodeGenerator/_module.json       |  2 +-
 6 files changed, 6 insertions(+), 82 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index cdf4768..f0cbd0f 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.6.9</Version>
+    <Version>1.7.0</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 70673f3..232b71e 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" />
     <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.8.2" />
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.8.8" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.8.9" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
@@ -15,14 +15,6 @@
     <ProjectReference Include="..\Domain\Domain.csproj" />
   </ItemGroup>
 
-  <!--打包模块相关文件到NuGet包中，此功能需要编译两次项目才行，因为打包操作在创建_module.json文件之前执行的-->
-  <ItemGroup>
-    <Content Include="$(SolutionDir)\src\WebHost\_modules*\**\*.*" PackagePath="contentFiles\any\any">
-      <Pack>true</Pack>
-      <PackageCopyToOutput>true</PackageCopyToOutput>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt">
       <Generator>TextTemplatingFilePreprocessor</Generator>
@@ -724,56 +716,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Templates\Default\T4\src\DirectoryBuildProps.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>DirectoryBuildProps.tt</DependentUpon>
-    </Compile>
     <Compile Update="Templates\Default\T4\src\Library\Application\Csproj.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>Csproj.tt</DependentUpon>
     </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Domain\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Domain\Entity.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Entity.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Domain\Models\QueryModel.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>QueryModel.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Domain\Repository.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Repository.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\Eslintrc.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Eslintrc.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Web\Csproj.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
   </ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
index aa6525f..0db9cd0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
@@ -55,23 +55,8 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(@""" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include=""..\Infrastructure\Infrastructure.csproj"" />
-  </ItemGroup>
-    
-  <!--打包模块相关文件到NuGet包中，此功能需要编译两次项目才行，因为打包操作在创建_module.json文件之前执行的-->
-  <ItemGroup>
-    <Content Include=""$(SolutionDir)\src\WebHost\_modules*\**\*.*"" PackagePath=""contentFiles\any\any"">
-      <Pack>true</Pack>
-      <PackageCopyToOutput>true</PackageCopyToOutput>
-    </Content>
-  </ItemGroup>
-
-</Project>
-");
+            this.Write("\" />\r\n  </ItemGroup>\r\n\r\n  <ItemGroup>\r\n    <ProjectReference Include=\"..\\Infrastr" +
+                    "ucture\\Infrastructure.csproj\" />\r\n  </ItemGroup>\r\n    \r\n</Project>\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
index 2712c0f..923211f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
@@ -14,12 +14,4 @@
     <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
   </ItemGroup>
     
-  <!--打包模块相关文件到NuGet包中，此功能需要编译两次项目才行，因为打包操作在创建_module.json文件之前执行的-->
-  <ItemGroup>
-    <Content Include="$(SolutionDir)\src\WebHost\_modules*\**\*.*" PackagePath="contentFiles\any\any">
-      <Pack>true</Pack>
-      <PackageCopyToOutput>true</PackageCopyToOutput>
-    </Content>
-  </ItemGroup>
-
 </Project>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 4055486..235223d 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.8.1" />
     <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.8.1" />
     <PackageReference Include="NetModular.Lib.Host.Web" Version="1.8.6" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.8.8" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.8.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index 9ce83bc..300da52 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.6.9"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.7.0"}

From 97dc3dce6877bf28b32522a300820de4ad4d499f Mon Sep 17 00:00:00 2001
From: Refactoring <Refactoring.Life@outlook.com>
Date: Wed, 25 Mar 2020 01:38:16 +0800
Subject: [PATCH 40/71] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90?=
 =?UTF-8?q?Cols.js=E6=97=B6=E7=9A=84=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9A=84=E6=9C=AB=E5=B0=BE=E9=80=97=E5=8F=B7?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=BE=93=E5=87=BA=E9=97=AE=E9=A2=98=E3=80=82?=
 =?UTF-8?q?=202.=20=E6=B7=BB=E5=8A=A0XXXXOptions=E7=9A=84=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4Copy()=E5=AE=9E=E7=8E=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Default/T4/src/Library/Infrastructure/Options.cs         | 3 ++-
 .../Default/T4/src/Library/Infrastructure/Options.tt         | 5 ++++-
 .../Templates/Default/T4/src/UI/App/src/views/index/Cols.cs  | 2 +-
 .../Templates/Default/T4/src/UI/App/src/views/index/Cols.tt  | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs
index d44ab48..7caff99 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs
@@ -60,7 +60,8 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("Options : IModuleOptions\r\n    {\r\n\r\n    }\r\n}\r\n");
+            this.Write("Options : IModuleOptions\r\n    {\r\n        public IModuleOptions Copy()\r\n        {\r" +
+                    "\n            throw new System.NotImplementedException();\r\n        }\r\n    }\r\n}\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt
index de4ec53..b86383b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt
@@ -8,6 +8,9 @@ namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Infrastructure
     /// </summary>
     public class <#= _model.Module.Code #>Options : IModuleOptions
     {
-
+        public IModuleOptions Copy()
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.cs
index 08ea05a..2d54a49 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.cs
@@ -62,7 +62,7 @@ public virtual string TransformText()
             this.Write("\'\r\n  }");
             
             #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_class.IsEntityBase || i < _class.PropertyList.Count - 1 ? ",":""));
+            this.Write(this.ToStringHelper.ToStringWithCulture(i == _properties.Count - 1 ? "":","));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.tt
index 966837c..c9eea42 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.tt
@@ -12,7 +12,7 @@ export default [
   {
     name: '<#= p.CamelName #>',
     label: '<#= p.Remarks #>'
-  }<#= _class.IsEntityBase || i < _class.PropertyList.Count - 1 ? ",":"" #>
+  }<#= i == _properties.Count - 1 ? "":"," #>
 <#     } #>
 <#   } #>
 <#    if(_class.IsEntityBase){ #>

From 43db186585132a22678b5f8af7736cbc2f2c51ec Mon Sep 17 00:00:00 2001
From: Refactoring <Refactoring.Life@outlook.com>
Date: Wed, 25 Mar 2020 12:25:31 +0800
Subject: [PATCH 41/71] =?UTF-8?q?1.=20Cols.js=E7=94=9F=E6=88=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E7=BB=A7=E7=BB=AD=E4=BD=BF=E7=94=A8=E5=8E=9F?=
 =?UTF-8?q?=E5=85=88=E7=9A=84=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E3=80=82?=
 =?UTF-8?q?=20=E5=B7=B2=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98=E3=80=82=202.?=
 =?UTF-8?q?=20=E6=A8=A1=E5=9D=97=E9=80=89=E9=A1=B9=E7=9A=84IModuleOptions.?=
 =?UTF-8?q?Copy()=E6=96=B9=E6=B3=95=EF=BC=8C=E6=8F=90=E7=A4=BA=E6=9B=B4?=
 =?UTF-8?q?=E6=98=8E=E7=A1=AE=E7=9A=84=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=96=B0=E6=89=8B=E5=AE=9E=E7=8E=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Templates/Default/T4/src/Library/Infrastructure/Options.cs | 3 ++-
 .../Templates/Default/T4/src/Library/Infrastructure/Options.tt | 2 +-
 .../Templates/Default/T4/src/UI/App/src/views/index/Cols.cs    | 2 +-
 .../Templates/Default/T4/src/UI/App/src/views/index/Cols.tt    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs
index 7caff99..fa04897 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs
@@ -61,7 +61,8 @@ public virtual string TransformText()
             #line default
             #line hidden
             this.Write("Options : IModuleOptions\r\n    {\r\n        public IModuleOptions Copy()\r\n        {\r" +
-                    "\n            throw new System.NotImplementedException();\r\n        }\r\n    }\r\n}\r\n");
+                    "\n            throw new System.NotImplementedException(\"请实现当前类的深度复制功能，并返回新的对象。\");" +
+                    "\r\n        }\r\n    }\r\n}\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt
index b86383b..533defd 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt
@@ -10,7 +10,7 @@ namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Infrastructure
     {
         public IModuleOptions Copy()
         {
-            throw new System.NotImplementedException();
+            throw new System.NotImplementedException("请实现当前类的深度复制功能，并返回新的对象。");
         }
     }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.cs
index 2d54a49..26fd8d3 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.cs
@@ -62,7 +62,7 @@ public virtual string TransformText()
             this.Write("\'\r\n  }");
             
             #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(i == _properties.Count - 1 ? "":","));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_class.IsEntityBase || i < _properties.Count - 1 ? ",":""));
             
             #line default
             #line hidden
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.tt
index c9eea42..405f8ac 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.tt
@@ -12,7 +12,7 @@ export default [
   {
     name: '<#= p.CamelName #>',
     label: '<#= p.Remarks #>'
-  }<#= i == _properties.Count - 1 ? "":"," #>
+  }<#= _class.IsEntityBase || i < _properties.Count - 1 ? ",":"" #>
 <#     } #>
 <#   } #>
 <#    if(_class.IsEntityBase){ #>

From cb3068e38ecb0fdcc855914f6544c897631828e5 Mon Sep 17 00:00:00 2001
From: Liwj <wenju1991@163.com>
Date: Thu, 26 Mar 2020 09:30:44 +0800
Subject: [PATCH 42/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7NuGet=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                        |  2 +-
 src/Library/Application/Application.csproj       |  4 ++--
 src/Library/Domain/Domain.csproj                 |  6 +++---
 src/Library/Infrastructure/Infrastructure.csproj | 11 ++++++++---
 src/UI/module-codegenerator/src/config/index.js  |  2 +-
 src/Web/Web.csproj                               |  8 ++++----
 src/WebHost/WebHost.csproj                       | 14 +++++++-------
 src/WebHost/_modules/CodeGenerator/_module.json  |  2 +-
 8 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f0cbd0f..0b6f4aa 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.7.0</Version>
+    <Version>1.7.1</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index a0c655c..da3aa7f 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.8.1" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.1" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 1e244ff..bfbf0eb 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.8.1" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.8.1" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.8.2" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.1" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 232b71e..cfad782 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" />
-    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.8.2" />
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.8.9" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
+    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.9.1" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.1" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
@@ -721,6 +721,11 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Csproj.tt</DependentUpon>
     </Compile>
+    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Options.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Options.tt</DependentUpon>
+    </Compile>
   </ItemGroup>
 
 </Project>
diff --git a/src/UI/module-codegenerator/src/config/index.js b/src/UI/module-codegenerator/src/config/index.js
index f41427f..14da11b 100644
--- a/src/UI/module-codegenerator/src/config/index.js
+++ b/src/UI/module-codegenerator/src/config/index.js
@@ -6,6 +6,6 @@ const config = {
 
 // 开发模式
 if (isDev) {
-  config.baseUrl = 'https://api.demo.17mkh.com/api/'
+  config.baseUrl = 'http://localhost:6222/api/'
 }
 export default config
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 5cd75a0..6aed639 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.8.0" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.8.1" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.8.2" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.8.0" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.2" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 235223d..465d55b 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.8.0" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.8.1" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.8.1" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.8.1" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.8.1" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.8.6" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.8.9" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.2" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index 300da52..c3ff69c 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.7.0"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.7.1"}

From 8b5fcd431747c0ec8e9f4f45927e0606071b5d9c Mon Sep 17 00:00:00 2001
From: OLDLI <wenju1991@163.com>
Date: Tue, 31 Mar 2020 12:43:32 +0800
Subject: [PATCH 43/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                          |  2 +-
 src/Library/Application/Application.csproj         |  4 ++--
 .../Application/ClassService/ClassService.cs       |  1 -
 .../Application/ClassService/IClassService.cs      |  1 -
 .../ClassService/ViewModels/ClassUpdateModel.cs    |  1 -
 .../Application/EnumItemService/EnumItemService.cs |  1 -
 .../EnumItemService/IEnumItemService.cs            |  1 -
 src/Library/Application/EnumService/EnumService.cs |  1 -
 .../Application/EnumService/IEnumService.cs        |  1 -
 .../ModelPropertyService/IModelPropertyService.cs  |  1 -
 .../ModelPropertyService/ModelPropertyService.cs   |  1 -
 .../Application/ModuleService/IModuleService.cs    |  1 -
 .../Application/ModuleService/ModuleService.cs     |  2 --
 .../OnlineModuleService/IOnlineModuleService.cs    |  1 -
 .../OnlineModuleService/OnlineModuleService.cs     |  2 --
 .../ViewModels/OnlineModuleAddModel.cs             |  4 ----
 .../ViewModels/OnlineModuleUpdateModel.cs          |  1 -
 .../PropertyService/IPropertyService.cs            |  1 -
 .../Application/PropertyService/PropertyService.cs |  1 -
 src/Library/Domain/Domain.csproj                   |  6 +++---
 .../Domain/OnlineModule/IOnlineModuleRepository.cs |  1 -
 .../OnlineModule/Models/OnlineModuleQueryModel.cs  |  3 +--
 src/Library/Infrastructure/CodeGeneratorOptions.cs |  1 -
 src/Library/Infrastructure/Infrastructure.csproj   |  4 ++--
 src/Library/Infrastructure/NuGet/NugetHelper.cs    |  1 -
 .../Repositories/PostgreSQLRepository.Extend.cs    |  5 +----
 .../src/UI/App/src/api/components/Entity.Extend.cs |  1 -
 .../UI/App/src/views/components/SavePage.Extend.cs |  1 -
 .../T4/src/UI/App/src/views/index/Cols.Extend.cs   |  1 -
 .../T4/src/UI/App/src/views/index/Index.Extend.cs  |  1 -
 .../T4/src/UI/App/src/views/index/Page.Extend.cs   |  1 -
 .../Templates/TemplateBuilderAbstract.cs           |  1 -
 src/Web/Controllers/ClassController.cs             |  1 -
 src/Web/Controllers/EnumController.cs              |  1 -
 src/Web/Controllers/EnumItemController.cs          |  1 -
 src/Web/Controllers/ModelPropertyController.cs     |  1 -
 src/Web/Controllers/ModuleController.cs            |  1 -
 src/Web/Controllers/OnlineModuleController.cs      |  1 -
 src/Web/Controllers/PropertyController.cs          |  1 -
 src/Web/Web.csproj                                 |  8 ++++----
 src/WebHost/WebHost.csproj                         | 14 +++++++-------
 src/WebHost/_modules/CodeGenerator/_module.json    |  2 +-
 42 files changed, 22 insertions(+), 64 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 0b6f4aa..2525ea1 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.7.1</Version>
+    <Version>1.7.2</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index da3aa7f..24410a1 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.1" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.5" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.2" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Application/ClassService/ClassService.cs b/src/Library/Application/ClassService/ClassService.cs
index fdbbc55..f93db49 100644
--- a/src/Library/Application/ClassService/ClassService.cs
+++ b/src/Library/Application/ClassService/ClassService.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using AutoMapper;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.ClassService.ViewModels;
 using NetModular.Module.CodeGenerator.Application.ModuleService;
 using NetModular.Module.CodeGenerator.Application.ModuleService.ResultModels;
diff --git a/src/Library/Application/ClassService/IClassService.cs b/src/Library/Application/ClassService/IClassService.cs
index f33d1f6..354a8dd 100644
--- a/src/Library/Application/ClassService/IClassService.cs
+++ b/src/Library/Application/ClassService/IClassService.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.ClassService.ViewModels;
 using NetModular.Module.CodeGenerator.Application.ModuleService.ResultModels;
 using NetModular.Module.CodeGenerator.Domain.Class.Models;
diff --git a/src/Library/Application/ClassService/ViewModels/ClassUpdateModel.cs b/src/Library/Application/ClassService/ViewModels/ClassUpdateModel.cs
index 5e790f1..2d980e3 100644
--- a/src/Library/Application/ClassService/ViewModels/ClassUpdateModel.cs
+++ b/src/Library/Application/ClassService/ViewModels/ClassUpdateModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using AutoMapper;
 using NetModular.Module.CodeGenerator.Domain.Class;
 
 namespace NetModular.Module.CodeGenerator.Application.ClassService.ViewModels
diff --git a/src/Library/Application/EnumItemService/EnumItemService.cs b/src/Library/Application/EnumItemService/EnumItemService.cs
index 62782f0..e13c0c2 100644
--- a/src/Library/Application/EnumItemService/EnumItemService.cs
+++ b/src/Library/Application/EnumItemService/EnumItemService.cs
@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using AutoMapper;
 using NetModular.Lib.Utils.Core.Models;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.EnumItemService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.EnumItem;
 using NetModular.Module.CodeGenerator.Domain.EnumItem.Models;
diff --git a/src/Library/Application/EnumItemService/IEnumItemService.cs b/src/Library/Application/EnumItemService/IEnumItemService.cs
index b0ff31c..b0b4ac6 100644
--- a/src/Library/Application/EnumItemService/IEnumItemService.cs
+++ b/src/Library/Application/EnumItemService/IEnumItemService.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using NetModular.Lib.Utils.Core.Models;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.EnumItemService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.EnumItem.Models;
 
diff --git a/src/Library/Application/EnumService/EnumService.cs b/src/Library/Application/EnumService/EnumService.cs
index f3184fc..b32cab5 100644
--- a/src/Library/Application/EnumService/EnumService.cs
+++ b/src/Library/Application/EnumService/EnumService.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.EnumService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Enum;
 using NetModular.Module.CodeGenerator.Domain.Enum.Models;
diff --git a/src/Library/Application/EnumService/IEnumService.cs b/src/Library/Application/EnumService/IEnumService.cs
index 4d83012..13aced5 100644
--- a/src/Library/Application/EnumService/IEnumService.cs
+++ b/src/Library/Application/EnumService/IEnumService.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.EnumService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Enum.Models;
 
diff --git a/src/Library/Application/ModelPropertyService/IModelPropertyService.cs b/src/Library/Application/ModelPropertyService/IModelPropertyService.cs
index 6f4b2b2..895e733 100644
--- a/src/Library/Application/ModelPropertyService/IModelPropertyService.cs
+++ b/src/Library/Application/ModelPropertyService/IModelPropertyService.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using NetModular.Lib.Utils.Core.Models;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.ModelPropertyService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.ModelProperty.Models;
 
diff --git a/src/Library/Application/ModelPropertyService/ModelPropertyService.cs b/src/Library/Application/ModelPropertyService/ModelPropertyService.cs
index 7c6cb85..f2e7f30 100644
--- a/src/Library/Application/ModelPropertyService/ModelPropertyService.cs
+++ b/src/Library/Application/ModelPropertyService/ModelPropertyService.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using AutoMapper;
 using NetModular.Lib.Utils.Core.Models;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.ModelPropertyService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Class;
 using NetModular.Module.CodeGenerator.Domain.ModelProperty;
diff --git a/src/Library/Application/ModuleService/IModuleService.cs b/src/Library/Application/ModuleService/IModuleService.cs
index 2d06411..aa5aa67 100644
--- a/src/Library/Application/ModuleService/IModuleService.cs
+++ b/src/Library/Application/ModuleService/IModuleService.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.ModuleService.ResultModels;
 using NetModular.Module.CodeGenerator.Application.ModuleService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Class;
diff --git a/src/Library/Application/ModuleService/ModuleService.cs b/src/Library/Application/ModuleService/ModuleService.cs
index 6837f26..1d11496 100644
--- a/src/Library/Application/ModuleService/ModuleService.cs
+++ b/src/Library/Application/ModuleService/ModuleService.cs
@@ -5,8 +5,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
-using NetModular.Lib.Utils.Core.Extensions;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.ModuleService.ResultModels;
 using NetModular.Module.CodeGenerator.Application.ModuleService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Class;
diff --git a/src/Library/Application/OnlineModuleService/IOnlineModuleService.cs b/src/Library/Application/OnlineModuleService/IOnlineModuleService.cs
index a5d0881..aed390a 100644
--- a/src/Library/Application/OnlineModuleService/IOnlineModuleService.cs
+++ b/src/Library/Application/OnlineModuleService/IOnlineModuleService.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.OnlineModuleService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.OnlineModule.Models;
 
diff --git a/src/Library/Application/OnlineModuleService/OnlineModuleService.cs b/src/Library/Application/OnlineModuleService/OnlineModuleService.cs
index f107bb5..298a31d 100644
--- a/src/Library/Application/OnlineModuleService/OnlineModuleService.cs
+++ b/src/Library/Application/OnlineModuleService/OnlineModuleService.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.OnlineModuleService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.OnlineModule;
 using NetModular.Module.CodeGenerator.Domain.OnlineModule.Models;
diff --git a/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleAddModel.cs b/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleAddModel.cs
index 3801839..0a85d0a 100644
--- a/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleAddModel.cs
+++ b/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleAddModel.cs
@@ -1,7 +1,3 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using NetModular.Module.CodeGenerator.Domain.OnlineModule;
-
 namespace NetModular.Module.CodeGenerator.Application.OnlineModuleService.ViewModels
 {
     /// <summary>
diff --git a/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleUpdateModel.cs b/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleUpdateModel.cs
index 9529964..52c291c 100644
--- a/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleUpdateModel.cs
+++ b/src/Library/Application/OnlineModuleService/ViewModels/OnlineModuleUpdateModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using NetModular.Module.CodeGenerator.Domain.OnlineModule;
 
 namespace NetModular.Module.CodeGenerator.Application.OnlineModuleService.ViewModels
 {
diff --git a/src/Library/Application/PropertyService/IPropertyService.cs b/src/Library/Application/PropertyService/IPropertyService.cs
index 32ad09a..4f96a32 100644
--- a/src/Library/Application/PropertyService/IPropertyService.cs
+++ b/src/Library/Application/PropertyService/IPropertyService.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using NetModular.Lib.Utils.Core.Models;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.PropertyService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Property.Models;
 
diff --git a/src/Library/Application/PropertyService/PropertyService.cs b/src/Library/Application/PropertyService/PropertyService.cs
index 4b776f7..255aab1 100644
--- a/src/Library/Application/PropertyService/PropertyService.cs
+++ b/src/Library/Application/PropertyService/PropertyService.cs
@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using AutoMapper;
 using NetModular.Lib.Utils.Core.Models;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.PropertyService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Class;
 using NetModular.Module.CodeGenerator.Domain.Property;
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index bfbf0eb..6380126 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.1" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.1" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.5" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.5" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.3" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Domain/OnlineModule/IOnlineModuleRepository.cs b/src/Library/Domain/OnlineModule/IOnlineModuleRepository.cs
index 7f87d20..434f1e1 100644
--- a/src/Library/Domain/OnlineModule/IOnlineModuleRepository.cs
+++ b/src/Library/Domain/OnlineModule/IOnlineModuleRepository.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using NetModular.Lib.Data.Abstractions;
-using NetModular.Lib.Data.Abstractions.Pagination;
 using NetModular.Module.CodeGenerator.Domain.OnlineModule.Models;
 
 namespace NetModular.Module.CodeGenerator.Domain.OnlineModule
diff --git a/src/Library/Domain/OnlineModule/Models/OnlineModuleQueryModel.cs b/src/Library/Domain/OnlineModule/Models/OnlineModuleQueryModel.cs
index 828158c..b950356 100644
--- a/src/Library/Domain/OnlineModule/Models/OnlineModuleQueryModel.cs
+++ b/src/Library/Domain/OnlineModule/Models/OnlineModuleQueryModel.cs
@@ -1,7 +1,6 @@
-using System;
 using NetModular.Lib.Data.Query;
 
-namespace  NetModular.Module.CodeGenerator.Domain.OnlineModule.Models
+namespace NetModular.Module.CodeGenerator.Domain.OnlineModule.Models
 {
     public class OnlineModuleQueryModel : QueryModel
     {
diff --git a/src/Library/Infrastructure/CodeGeneratorOptions.cs b/src/Library/Infrastructure/CodeGeneratorOptions.cs
index c79d24f..bea541c 100644
--- a/src/Library/Infrastructure/CodeGeneratorOptions.cs
+++ b/src/Library/Infrastructure/CodeGeneratorOptions.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using NetModular.Lib.Options.Abstraction;
-using NetModular.Lib.Utils.Core.Extensions;
 using NetModular.Lib.Utils.Core.SystemConfig;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index cfad782..6db9357 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
-    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.9.1" />
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.9.2" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.3" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/src/Library/Infrastructure/NuGet/NugetHelper.cs b/src/Library/Infrastructure/NuGet/NugetHelper.cs
index 9fcf1f7..3a42a3d 100644
--- a/src/Library/Infrastructure/NuGet/NugetHelper.cs
+++ b/src/Library/Infrastructure/NuGet/NugetHelper.cs
@@ -5,7 +5,6 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using NetModular.Lib.Utils.Core.Attributes;
-using NetModular.Lib.Utils.Core.Extensions;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.NuGet
 {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs
index e5ddfb7..c273fa5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/PostgreSQLRepository.Extend.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using System.Linq;
-using System.Text;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Infrastructure.Repositories
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs
index 4d9ba2f..806c372 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/components/Entity.Extend.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using System.Linq;
-using NetModular.Lib.Utils.Core.Extensions;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App.src.api.components
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs
index 6bfc88f..1bddd37 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/components/SavePage.Extend.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using System.Linq;
-using NetModular.Lib.Utils.Core.Extensions;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App.src.views.components
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs
index 746d881..704aa0b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.Extend.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using NetModular.Lib.Utils.Core.Extensions;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App.src.views.index
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
index 5c4decb..beb3503 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.Extend.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using System.Linq;
-using NetModular.Lib.Utils.Core.Extensions;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App.src.views.index
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs
index d82068d..c01917a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Page.Extend.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using System.Linq;
-using NetModular.Lib.Utils.Core.Extensions;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App.src.views.index
diff --git a/src/Library/Infrastructure/Templates/TemplateBuilderAbstract.cs b/src/Library/Infrastructure/Templates/TemplateBuilderAbstract.cs
index 4d93420..a223bc2 100644
--- a/src/Library/Infrastructure/Templates/TemplateBuilderAbstract.cs
+++ b/src/Library/Infrastructure/Templates/TemplateBuilderAbstract.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using NetModular.Lib.Utils.Core;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates
diff --git a/src/Web/Controllers/ClassController.cs b/src/Web/Controllers/ClassController.cs
index d4ab239..d24bcb6 100644
--- a/src/Web/Controllers/ClassController.cs
+++ b/src/Web/Controllers/ClassController.cs
@@ -7,7 +7,6 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using NetModular.Lib.Auth.Web.Attributes;
 using NetModular.Lib.Utils.Core.Extensions;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Lib.Utils.Core.SystemConfig;
 using NetModular.Module.CodeGenerator.Application.ClassService;
 using NetModular.Module.CodeGenerator.Application.ClassService.ViewModels;
diff --git a/src/Web/Controllers/EnumController.cs b/src/Web/Controllers/EnumController.cs
index c419b77..470be43 100644
--- a/src/Web/Controllers/EnumController.cs
+++ b/src/Web/Controllers/EnumController.cs
@@ -4,7 +4,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using NetModular.Lib.Auth.Web.Attributes;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.EnumService;
 using NetModular.Module.CodeGenerator.Application.EnumService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Enum.Models;
diff --git a/src/Web/Controllers/EnumItemController.cs b/src/Web/Controllers/EnumItemController.cs
index e09221e..f82f6da 100644
--- a/src/Web/Controllers/EnumItemController.cs
+++ b/src/Web/Controllers/EnumItemController.cs
@@ -5,7 +5,6 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using NetModular.Lib.Auth.Web.Attributes;
 using NetModular.Lib.Utils.Core.Models;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.EnumItemService;
 using NetModular.Module.CodeGenerator.Application.EnumItemService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.EnumItem.Models;
diff --git a/src/Web/Controllers/ModelPropertyController.cs b/src/Web/Controllers/ModelPropertyController.cs
index 369ed95..dbe7211 100644
--- a/src/Web/Controllers/ModelPropertyController.cs
+++ b/src/Web/Controllers/ModelPropertyController.cs
@@ -5,7 +5,6 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using NetModular.Lib.Auth.Web.Attributes;
 using NetModular.Lib.Utils.Core.Models;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.ModelPropertyService;
 using NetModular.Module.CodeGenerator.Application.ModelPropertyService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.ModelProperty.Models;
diff --git a/src/Web/Controllers/ModuleController.cs b/src/Web/Controllers/ModuleController.cs
index 747c0ae..c47544b 100644
--- a/src/Web/Controllers/ModuleController.cs
+++ b/src/Web/Controllers/ModuleController.cs
@@ -5,7 +5,6 @@
 using System.Web;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Lib.Utils.Core.SystemConfig;
 using NetModular.Module.CodeGenerator.Application.ModuleService;
 using NetModular.Module.CodeGenerator.Application.ModuleService.ViewModels;
diff --git a/src/Web/Controllers/OnlineModuleController.cs b/src/Web/Controllers/OnlineModuleController.cs
index 69f38fc..ced05a1 100644
--- a/src/Web/Controllers/OnlineModuleController.cs
+++ b/src/Web/Controllers/OnlineModuleController.cs
@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.OnlineModuleService;
 using NetModular.Module.CodeGenerator.Application.OnlineModuleService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.OnlineModule.Models;
diff --git a/src/Web/Controllers/PropertyController.cs b/src/Web/Controllers/PropertyController.cs
index 7b36993..bda5a10 100644
--- a/src/Web/Controllers/PropertyController.cs
+++ b/src/Web/Controllers/PropertyController.cs
@@ -6,7 +6,6 @@
 using NetModular.Lib.Auth.Web.Attributes;
 using NetModular.Lib.Utils.Core.Extensions;
 using NetModular.Lib.Utils.Core.Models;
-using NetModular.Lib.Utils.Core.Result;
 using NetModular.Module.CodeGenerator.Application.PropertyService;
 using NetModular.Module.CodeGenerator.Application.PropertyService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Property;
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 6aed639..ae83e1a 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.1" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.1" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.1" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.2" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.2" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.2" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.3" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.3" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 465d55b..e0b3db1 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.1" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.1" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.1" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.1" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.1" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.2" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.1" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.8" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.5" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.5" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.5" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.2" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.5" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index c3ff69c..f6e6e39 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.7.1"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.7.2"}

From d74133cc5ec7a8567f0cbfcd3c413cdf80a82fc4 Mon Sep 17 00:00:00 2001
From: OLDLI <wenju1991@163.com>
Date: Tue, 31 Mar 2020 19:55:01 +0800
Subject: [PATCH 44/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                        | 2 +-
 src/Library/Domain/Domain.csproj                 | 2 +-
 src/Library/Infrastructure/Infrastructure.csproj | 4 ++--
 src/Web/Web.csproj                               | 6 +++---
 src/WebHost/WebHost.csproj                       | 8 ++++----
 src/WebHost/_modules/CodeGenerator/_module.json  | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 2525ea1..08af463 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.7.2</Version>
+    <Version>1.7.3</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 6380126..6784790 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.5" />
     <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.5" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.3" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.4" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 6db9357..f531d4e 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
-    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.9.2" />
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.3" />
+    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.9.3" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.5" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index ae83e1a..bb0f763 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.2" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.2" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.3" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.3" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.3" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.4" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.3" />
   </ItemGroup>
   
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index e0b3db1..b91432b 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.8" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.10" />
     <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.5" />
     <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.5" />
     <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.5" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.2" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.5" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.3" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.3" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.6" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index f6e6e39..5d1701e 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.7.2"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.7.3"}

From 1cb0e27a2b9c533a7e54a28a27f3d641d339b675 Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Thu, 9 Apr 2020 22:32:07 +0800
Subject: [PATCH 45/71] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF=202=E3=80=81?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/SQLite/Nm_Admin.db                       | Bin 176128 -> 180224 bytes
 src/Directory.Build.props                     |   2 +-
 src/Library/Application/Application.csproj    |   4 +-
 src/Library/Domain/Domain.csproj              |   6 +-
 .../Infrastructure/Infrastructure.csproj      |  15 ++---
 .../Default/T4/src/UI/App/BabelConfig.cs      |   3 +-
 .../Default/T4/src/UI/App/BabelConfig.tt      |   9 ++-
 .../Default/T4/src/UI/App/Package.cs          |  21 +++---
 .../Default/T4/src/UI/App/Package.tt          |  21 +++---
 .../Default/T4/src/UI/App/VueConfig.cs        |  61 ++++++++++--------
 .../Default/T4/src/UI/App/VueConfig.tt        |  15 +++--
 .../_modules/CodeGenerator/_module.json       |   1 -
 src/UI/module-codegenerator/babel.config.js   |   9 ++-
 src/UI/module-codegenerator/package.json      |   8 +--
 src/UI/module-codegenerator/vue.config.js     |   7 +-
 src/Web/Web.csproj                            |   8 +--
 src/WebHost/WebHost.csproj                    |  14 ++--
 .../_modules/CodeGenerator/_module.json       |   2 +-
 .../Infrastructure.Test.csproj                |   2 +-
 test/Infrastructure.Test/NugetHelperTest.cs   |   1 +
 20 files changed, 116 insertions(+), 93 deletions(-)
 delete mode 100644 src/Library/Infrastructure/_modules/CodeGenerator/_module.json

diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index fb1529cd47477efbe2524efc474103641bfad2b5..006a41feedefcd5a72e3c0c22c8d4963c0a9051d 100644
GIT binary patch
delta 17099
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
G*8c!UaZ;ZE

delta 16791
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
V?;X0S`N^iy7x!%W^5~I+{tp@-4DkQ}

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 08af463..ca1df6b 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,7 +4,7 @@
     <Name>代码生成</Name>
     <Icon>develop</Icon>
     <Authors>Oldli</Authors>
-    <Version>1.7.3</Version>
+    <Version>1.7.4</Version>
     <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 24410a1..af135d0 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.5" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.2" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.12" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.3" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 6784790..1dbc1c2 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.5" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.5" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.4" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.12" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.12" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.5" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index f531d4e..5f1fc1a 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
-    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.9.3" />
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.5" />
+    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.9.4" />
+    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.7" />
     <PackageReference Include="System.CodeDom" Version="4.7.0" />
   </ItemGroup>
 
@@ -716,15 +716,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Templates\Default\T4\src\Library\Application\Csproj.cs">
+    <Compile Update="Templates\Default\T4\src\UI\App\BabelConfig.cs">
       <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
     </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Options.cs">
+    <Compile Update="Templates\Default\T4\src\UI\App\Package.cs">
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Update="Templates\Default\T4\src\UI\App\VueConfig.cs">
       <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Options.tt</DependentUpon>
     </Compile>
   </ItemGroup>
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.cs
index 2101f23..4661de3 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.cs
@@ -25,7 +25,8 @@ public partial class BabelConfig : BabelConfigBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("module.exports = {\r\n  presets: [\'@vue/cli-plugin-babel/preset\']\r\n}\r\n");
+            this.Write("module.exports = {\r\n  presets: [\r\n    [\r\n      \'@vue/cli-plugin-babel/preset\',\r\n " +
+                    "     {\r\n        useBuiltIns: \'entry\'\r\n      }\r\n    ]\r\n  ]\r\n}\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.tt
index 716b023..00892ae 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/BabelConfig.tt
@@ -1,3 +1,10 @@
 module.exports = {
-  presets: ['@vue/cli-plugin-babel/preset']
+  presets: [
+    [
+      '@vue/cli-plugin-babel/preset',
+      {
+        useBuiltIns: 'entry'
+      }
+    ]
+  ]
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
index 87b44a3..723a00e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
@@ -75,24 +75,23 @@ public virtual string TransformText()
     ""pub"": ""cd ../../../script && npm_publish.ps1""
   },
   ""dependencies"": {
-    ""netmodular-module-admin"": ""^1.1.9"",
-    ""netmodular-ui"": ""^1.4.6""
+    ""netmodular-module-admin"": ""^1.2.9"",
+    ""netmodular-ui"": ""^1.7.6""
   },
   ""devDependencies"": {
-    ""@vue/cli-plugin-babel"": ""^4.2.2"",
-    ""@vue/cli-plugin-eslint"": ""^4.2.2"",
-    ""@vue/cli-plugin-router"": ""^4.2.2"",
-    ""@vue/cli-plugin-vuex"": ""^4.2.2"",
-    ""@vue/cli-service"": ""^4.2.2"",
+    ""@vue/cli-plugin-babel"": ""^4.2.3"",
+    ""@vue/cli-plugin-eslint"": ""^4.2.3"",
+    ""@vue/cli-plugin-router"": ""^4.2.3"",
+    ""@vue/cli-plugin-vuex"": ""^4.2.3"",
+    ""@vue/cli-service"": ""^4.2.3"",
     ""@vue/eslint-config-prettier"": ""^5.0.0"",
-    ""babel-eslint"": ""^10.0.3"",
+    ""babel-eslint"": ""^10.1.0"",
     ""eslint"": ""^5.16.0"",
     ""eslint-plugin-prettier"": ""^3.1.2"",
     ""eslint-plugin-vue"": ""^5.0.0"",
     ""prettier"": ""^1.18.2"",
-    ""raw-loader"": ""^3.1.0"",
-    ""rimraf"": ""^3.0.1"",
-    ""sass"": ""^1.25.0"",
+    ""rimraf"": ""^3.0.2"",
+    ""sass"": ""^1.26.3"",
     ""sass-loader"": ""^8.0.2"",
     ""vue-template-compiler"": ""^2.6.11""
   }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
index a65f47d..a4471b3 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
@@ -19,24 +19,23 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.1.9",
-    "netmodular-ui": "^1.4.6"
+    "netmodular-module-admin": "^1.2.9",
+    "netmodular-ui": "^1.7.6"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.2.2",
-    "@vue/cli-plugin-eslint": "^4.2.2",
-    "@vue/cli-plugin-router": "^4.2.2",
-    "@vue/cli-plugin-vuex": "^4.2.2",
-    "@vue/cli-service": "^4.2.2",
+    "@vue/cli-plugin-babel": "^4.2.3",
+    "@vue/cli-plugin-eslint": "^4.2.3",
+    "@vue/cli-plugin-router": "^4.2.3",
+    "@vue/cli-plugin-vuex": "^4.2.3",
+    "@vue/cli-service": "^4.2.3",
     "@vue/eslint-config-prettier": "^5.0.0",
-    "babel-eslint": "^10.0.3",
+    "babel-eslint": "^10.1.0",
     "eslint": "^5.16.0",
     "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-vue": "^5.0.0",
     "prettier": "^1.18.2",
-    "raw-loader": "^3.1.0",
-    "rimraf": "^3.0.1",
-    "sass": "^1.25.0",
+    "rimraf": "^3.0.2",
+    "sass": "^1.26.3",
     "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
index 35380b6..27fe4b9 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
@@ -25,30 +25,45 @@ public partial class VueConfig : VueConfigBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("const path = require(\'path\')\r\nconst CopyWebpackPlugin = require(\'copy-webpack-plu" +
-                    "gin\')\r\nconst TerserPlugin = require(\'terser-webpack-plugin\')\r\nconst isDev = proc" +
-                    "ess.env.NODE_ENV === \'development\' // ��������\r\n\r\n// ���ӻ�������\r\nprocess.env.VUE_APP_COP" +
-                    "YRIGHT = \'");
+            this.Write("const CopyWebpackPlugin = require(\'copy-webpack-plugin\')\r\nconst TerserPlugin = re" +
+                    "quire(\'terser-webpack-plugin\')\r\n\r\n// ���ӻ�������\r\nprocess.env.VUE_APP_COPYRIGHT = \'");
             
-            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Copyright));
             
             #line default
             #line hidden
-            this.Write("\'\r\nprocess.env.VUE_APP_BUILD_TIME = require(\'dayjs\')().format(\'YYYYMDHHmmss\')\r\n//" +
-                    " ������·��\r\nconst outputDir = \'../../WebHost/wwwroot/app\'\r\n\r\nmodule.exports = {\r\n  " +
-                    "devServer: {\r\n    port: ");
+            this.Write(@"'
+process.env.VUE_APP_BUILD_TIME = require('dayjs')().format('YYYYMDHHmmss')
+
+const path = require('path')
+// ��������
+const isDev = process.env.NODE_ENV === 'development'
+// ������·��
+const outputDir = '../../WebHost/wwwroot/app'
+
+module.exports = {
+  outputDir: outputDir,
+  publicPath: '/app',
+  devServer: {
+    port: ");
             
-            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.No + 5220));
             
             #line default
             #line hidden
-            this.Write("\r\n  },\r\n  outputDir: outputDir,\r\n  publicPath: \'/app\',\r\n  transpileDependencies: " +
-                    "[\'netmodular.*\', \'element-ui\'],\r\n  configureWebpack() {\r\n    let config = {\r\n   " +
-                    "   plugins: [\r\n        /**\r\n         * ����");
+            this.Write("\r\n  },\r\n  transpileDependencies: [\'");
+            
+            #line 21 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            
+            #line default
+            #line hidden
+            this.Write("-*\', \'element-ui\'],\r\n  configureWebpack() {\r\n    let config = {\r\n      plugins: [" +
+                    "\r\n        /**\r\n         * ����");
             
-            #line 24 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 26 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -56,7 +71,7 @@ public virtual string TransformText()
             this.Write("-ui/publicĿ¼�µ��ļ������Ŀ¼\r\n         */\r\n        new CopyWebpackPlugin([\r\n          {\r" +
                     "\n            from: path.join(__dirname, \'node_modules/");
             
-            #line 28 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 30 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -102,7 +117,7 @@ public virtual string TransformText()
     /**
      * ����index.htmlģ��·����ʹ��");
             
-            #line 67 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 69 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -110,7 +125,7 @@ public virtual string TransformText()
             this.Write("-ui/public�е�ģ��\r\n     */\r\n    config.plugin(\'html\').tap(args => {\r\n      args[0].t" +
                     "emplate = \'./node_modules/");
             
-            #line 70 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 72 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -128,7 +143,6 @@ public virtual string TransformText()
       )
       // �ǿ�������
       .when(!isDev, config => {
-
         // ���
         config.optimization.splitChunks({
           chunks: 'all',
@@ -139,16 +153,11 @@ public virtual string TransformText()
               test: /[\\/]node_modules[\\/]element-ui(.*)/
             },
             skins: {
-              name: 'chunk-");
-            
-            #line 94 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
-            
-            #line default
-            #line hidden
-            this.Write("-ui\',\r\n              priority: 10,\r\n              test: /[\\\\/]node_modules[\\\\/]");
+              name: 'chunk-netmodular-ui',
+              priority: 10,
+              test: /[\\/]node_modules[\\/]");
             
-            #line 96 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 97 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
index d49c02e..205590f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
@@ -1,22 +1,24 @@
 <#@ template language="C#" #>
-const path = require('path')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const TerserPlugin = require('terser-webpack-plugin')
-const isDev = process.env.NODE_ENV === 'development' // 开发环境
 
 // 增加环境变量
 process.env.VUE_APP_COPYRIGHT = '<#= _model.Module.Copyright #>'
 process.env.VUE_APP_BUILD_TIME = require('dayjs')().format('YYYYMDHHmmss')
+
+const path = require('path')
+// 开发环境
+const isDev = process.env.NODE_ENV === 'development'
 // 打包输出路径
 const outputDir = '../../WebHost/wwwroot/app'
 
 module.exports = {
+  outputDir: outputDir,
+  publicPath: '/app',
   devServer: {
     port: <#= _model.Module.No + 5220 #>
   },
-  outputDir: outputDir,
-  publicPath: '/app',
-  transpileDependencies: ['netmodular.*', 'element-ui'],
+  transpileDependencies: ['<#= _prefix #>-*', 'element-ui'],
   configureWebpack() {
     let config = {
       plugins: [
@@ -80,7 +82,6 @@ module.exports = {
       )
       // 非开发环境
       .when(!isDev, config => {
-
         // 拆分
         config.optimization.splitChunks({
           chunks: 'all',
@@ -91,7 +92,7 @@ module.exports = {
               test: /[\\/]node_modules[\\/]element-ui(.*)/
             },
             skins: {
-              name: 'chunk-<#= _prefix #>-ui',
+              name: 'chunk-netmodular-ui',
               priority: 10,
               test: /[\\/]node_modules[\\/]<#= _prefix #>-ui(.*)/
             }
diff --git a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json b/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
deleted file mode 100644
index c9275f4..0000000
--- a/src/Library/Infrastructure/_modules/CodeGenerator/_module.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Id": "CodeGenerator","Name":"代码生成器","Version":"1.5.9"}
diff --git a/src/UI/module-codegenerator/babel.config.js b/src/UI/module-codegenerator/babel.config.js
index 716b023..00892ae 100644
--- a/src/UI/module-codegenerator/babel.config.js
+++ b/src/UI/module-codegenerator/babel.config.js
@@ -1,3 +1,10 @@
 module.exports = {
-  presets: ['@vue/cli-plugin-babel/preset']
+  presets: [
+    [
+      '@vue/cli-plugin-babel/preset',
+      {
+        useBuiltIns: 'entry'
+      }
+    ]
+  ]
 }
diff --git a/src/UI/module-codegenerator/package.json b/src/UI/module-codegenerator/package.json
index 50b213f..ef537c9 100644
--- a/src/UI/module-codegenerator/package.json
+++ b/src/UI/module-codegenerator/package.json
@@ -2,9 +2,8 @@
   "name": "netmodular-module-codegenerator",
   "version": "1.0.3",
   "author": "Oldli",
-  "license": "ISC",
   "code": "codeGenerator",
-  "title": "代码生成器",
+  "title": "代码生成",
   "description": "NetModular代码生成器前端模块组件",
   "main": "src/index.js",
   "scripts": {
@@ -19,7 +18,7 @@
   },
   "dependencies": {
     "netmodular-module-admin": "^1.2.9",
-    "netmodular-ui": "^1.6.6"
+    "netmodular-ui": "^1.7.6"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.2.3",
@@ -33,10 +32,9 @@
     "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-vue": "^5.0.0",
     "prettier": "^1.18.2",
-    "raw-loader": "^3.1.0",
     "rimraf": "^3.0.2",
     "sass": "^1.26.3",
     "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.11"
   }
-}
\ No newline at end of file
+}
diff --git a/src/UI/module-codegenerator/vue.config.js b/src/UI/module-codegenerator/vue.config.js
index 6f71235..7d5689b 100644
--- a/src/UI/module-codegenerator/vue.config.js
+++ b/src/UI/module-codegenerator/vue.config.js
@@ -1,11 +1,13 @@
-const path = require('path')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const TerserPlugin = require('terser-webpack-plugin')
-const isDev = process.env.NODE_ENV === 'development' // 开发环境
 
 // 增加环境变量
 process.env.VUE_APP_COPYRIGHT = '版权所有：尼古拉斯·老李 | 用代码改变世界'
 process.env.VUE_APP_BUILD_TIME = require('dayjs')().format('YYYYMDHHmmss')
+
+const path = require('path')
+// 开发环境
+const isDev = process.env.NODE_ENV === 'development'
 // 打包输出路径
 const outputDir = '../../WebHost/wwwroot/app'
 
@@ -15,6 +17,7 @@ module.exports = {
   devServer: {
     port: 5222
   },
+  transpileDependencies: ['netmodular-*', 'element-ui'],
   configureWebpack() {
     let config = {
       plugins: [
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index bb0f763..f2577a3 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.3" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.3" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.4" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.3" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.4" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.4" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.5" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.4" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index b91432b..71df494 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.10" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.5" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.5" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.5" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.3" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.6" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.5" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.11" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.12" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.12" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.12" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.4" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.9" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
index 5d1701e..f8de325 100644
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ b/src/WebHost/_modules/CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.7.3"}
+{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.7.4"}
diff --git a/test/Infrastructure.Test/Infrastructure.Test.csproj b/test/Infrastructure.Test/Infrastructure.Test.csproj
index bc3454c..8d1e7d6 100644
--- a/test/Infrastructure.Test/Infrastructure.Test.csproj
+++ b/test/Infrastructure.Test/Infrastructure.Test.csproj
@@ -13,7 +13,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.2.0">
+    <PackageReference Include="coverlet.collector" Version="1.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/test/Infrastructure.Test/NugetHelperTest.cs b/test/Infrastructure.Test/NugetHelperTest.cs
index eda283f..79cb230 100644
--- a/test/Infrastructure.Test/NugetHelperTest.cs
+++ b/test/Infrastructure.Test/NugetHelperTest.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using NetModular;
 using NetModular.Lib.Utils.Core.SystemConfig;
 using NetModular.Module.CodeGenerator.Infrastructure;
 using NetModular.Module.CodeGenerator.Infrastructure.NuGet;

From 541fa4fdf1609ddea17c572f72205142a550b463 Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Sun, 19 Apr 2020 15:03:33 +0800
Subject: [PATCH 46/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/module.build.targets                    |   22 +-
 data/SQLite/Nm_Admin.db                       |  Bin 180224 -> 159744 bytes
 src/Directory.Build.props                     |   43 +-
 src/Library/Application/Application.csproj    |    4 +-
 .../ModuleService/ModuleService.cs            |   33 +-
 .../ModuleBuildCodeResultModel.cs             |    5 +
 src/Library/Domain/Domain.csproj              |    6 +-
 .../Infrastructure/CodeGeneratorConfig.cs     |   22 +
 .../Infrastructure/CodeGeneratorOptions.cs    |   61 -
 .../Infrastructure/Infrastructure.csproj      | 1350 ++++++++---------
 .../NuGet/NuGetPackageVersions.cs             |    4 +-
 .../Infrastructure/NuGet/NugetHelper.cs       |   24 +-
 .../Repositories/CodeGeneratorDbContext.cs    |    5 +-
 .../Templates/Default/T4/Gitattributes.cs     |    2 +-
 .../Templates/Default/T4/Gitignore.cs         |    2 +-
 .../Templates/Default/T4/Readme.cs            |    4 +-
 .../Templates/Default/T4/Solution.cs          |   32 +-
 .../Templates/Default/T4/Solution.tt          |    4 +-
 .../Default/T4/build/ModuleBuildTargets.cs    |   22 +-
 .../Default/T4/build/ModuleBuildTargets.tt    |   22 +-
 .../Default/T4/script/NpmInstall.Extend.cs    |   29 -
 .../Templates/Default/T4/script/NpmInstall.cs |  314 ----
 .../Templates/Default/T4/script/NpmInstall.tt |    3 -
 .../Default/T4/script/NpmPublish.Extend.cs    |   29 -
 .../Templates/Default/T4/script/NpmPublish.tt |    3 -
 .../Default/T4/script/NpmUpdate.Extend.cs     |   29 -
 .../Templates/Default/T4/script/NpmUpdate.cs  |  314 ----
 .../Templates/Default/T4/script/NpmUpdate.tt  |    3 -
 .../Default/T4/src/DirectoryBuildProps.cs     |   31 +-
 .../Default/T4/src/DirectoryBuildProps.tt     |    9 +-
 .../src/Library/Application/MapperConfig.cs   |   34 +-
 .../T4/src/Library/Application/ServiceImpl.cs |   70 +-
 .../Library/Application/ServiceInterface.cs   |   52 +-
 .../Application/ViewModels/AddModel.cs        |   28 +-
 .../T4/src/Library/Domain/EntityEnum.cs       |   26 +-
 .../T4/src/Library/Domain/EntityExtend.cs     |   10 +-
 .../{Options.Extend.cs => Config.Extend.cs}   |    6 +-
 .../Infrastructure/{Options.cs => Config.cs}  |   22 +-
 .../T4/src/Library/Infrastructure/Config.tt   |   13 +
 .../T4/src/Library/Infrastructure/Csproj.cs   |   22 +-
 .../T4/src/Library/Infrastructure/Csproj.tt   |    3 +-
 .../T4/src/Library/Infrastructure/Options.tt  |   16 -
 .../Infrastructure/Repositories/DbContext.cs  |   20 +-
 .../Infrastructure/Repositories/DbContext.tt  |    3 +-
 .../Repositories/SQLiteRepository.cs          |   14 +-
 .../Repositories/SqlServerRepository.cs       |   48 +-
 .../Default/T4/src/UI/App/Package.cs          |   33 +-
 .../Default/T4/src/UI/App/Package.tt          |   17 +-
 .../Default/T4/src/UI/App/src/Index.cs        |    2 +-
 .../Default/T4/src/UI/App/src/Main.cs         |    8 +-
 .../Default/T4/src/UI/App/src/Module.cs       |    8 +-
 .../Default/T4/src/UI/App/src/Module.tt       |    1 +
 .../Default/T4/src/UI/App/src/api/Index.cs    |    2 +-
 .../App/src/components/Components.Extend.cs   |    2 -
 .../src/UI/App/src/components/Components.cs   |   21 +-
 .../src/UI/App/src/components/Components.tt   |   22 +-
 .../App/src/components/ConfigPage.Extend.cs   |   35 +
 .../App/src/components/ConfigPage.cs}         |   30 +-
 .../src/UI/App/src/components/ConfigPage.tt   |   21 +
 .../T4/src/UI/App/src/config/Config.cs        |    4 +-
 .../T4/src/UI/App/src/config/Config.tt        |    2 +-
 .../Default/T4/src/UI/App/src/store/Store.cs  |    2 +-
 .../T4/src/UI/App/src/views/index/Cols.cs     |   22 +-
 .../Default/T4/src/Web/ModuleController.cs    |   10 +-
 .../Default/T4/src/WebHost/Program.cs         |    8 +-
 .../LaunchSettings.Extend.cs}                 |   10 +-
 .../WebHost/Properties/LaunchSettings.cs}     |   26 +-
 .../src/WebHost/Properties/LaunchSettings.tt  |   15 +
 .../Default/T4/src/WebHost/Startup.cs         |    8 +-
 .../T4/src/WebHost/config/cache.Extend.cs     |   30 -
 .../Default/T4/src/WebHost/config/cache.cs    |  308 ----
 .../Default/T4/src/WebHost/config/cache.tt    |    8 -
 .../WebHost/config/cacheDevelopment.Extend.cs |   30 -
 .../T4/src/WebHost/config/cacheDevelopment.cs |  307 ----
 .../T4/src/WebHost/config/cacheDevelopment.tt |    1 -
 .../Default/T4/src/WebHost/config/db.cs       |   24 +-
 .../T4/src/WebHost/config/dbDevelopment.cs    |    2 +-
 .../T4/src/WebHost/config/excel.Extend.cs     |   28 -
 .../Default/T4/src/WebHost/config/excel.cs    |  308 ----
 .../Default/T4/src/WebHost/config/excel.tt    |    7 -
 .../WebHost/config/excelDevelopment.Extend.cs |   28 -
 .../T4/src/WebHost/config/excelDevelopment.tt |    2 -
 .../Default/T4/src/WebHost/config/host.cs     |    4 +-
 .../T4/src/WebHost/config/hostDevelopment.cs  |    4 +-
 .../Default/T4/src/WebHost/config/jwt.cs      |  309 ----
 .../Default/T4/src/WebHost/config/jwt.tt      |   11 -
 .../WebHost/config/jwtDevelopment.Extend.cs   |   28 -
 .../T4/src/WebHost/config/jwtDevelopment.cs   |  307 ----
 .../T4/src/WebHost/config/jwtDevelopment.tt   |    2 -
 .../Default/T4/src/WebHost/config/logging.cs  |    2 +-
 .../components/config-codegenerator/index.vue |   45 +
 .../src/components/index.js                   |   11 +-
 .../src/views/module/index/index.vue          |    2 +-
 src/Web/Controllers/ClassController.cs        |   15 +-
 src/Web/Controllers/ModuleController.cs       |   15 +-
 src/Web/Web.csproj                            |    8 +-
 src/WebHost/WebHost.csproj                    |   14 +-
 .../_modules/02_CodeGenerator/_module.json    |    1 +
 .../_modules/CodeGenerator/_module.json       |    1 -
 src/WebHost/config/cache.Development.json     |    1 -
 src/WebHost/config/cache.json                 |    7 -
 src/WebHost/config/excel.Development.json     |    2 -
 src/WebHost/config/excel.json                 |    6 -
 src/WebHost/config/jwt.Development.json       |    1 -
 src/WebHost/config/jwt.json                   |   10 -
 test/Infrastructure.Test/NugetHelperTest.cs   |    4 +-
 106 files changed, 1320 insertions(+), 3700 deletions(-)
 create mode 100644 src/Library/Infrastructure/CodeGeneratorConfig.cs
 delete mode 100644 src/Library/Infrastructure/CodeGeneratorOptions.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.tt
 rename src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/{Options.Extend.cs => Config.Extend.cs} (87%)
 rename src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/{Options.cs => Config.cs} (95%)
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Config.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.Extend.cs
 rename src/Library/Infrastructure/Templates/Default/T4/src/{WebHost/config/excelDevelopment.cs => UI/App/src/components/ConfigPage.cs} (94%)
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.tt
 rename src/Library/Infrastructure/Templates/Default/T4/src/WebHost/{config/jwt.Extend.cs => Properties/LaunchSettings.Extend.cs} (71%)
 rename src/Library/Infrastructure/Templates/Default/T4/{script/NpmPublish.cs => src/WebHost/Properties/LaunchSettings.cs} (93%)
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Properties/LaunchSettings.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.tt
 create mode 100644 src/UI/module-codegenerator/src/components/config-codegenerator/index.vue
 create mode 100644 src/WebHost/_modules/02_CodeGenerator/_module.json
 delete mode 100644 src/WebHost/_modules/CodeGenerator/_module.json
 delete mode 100644 src/WebHost/config/cache.Development.json
 delete mode 100644 src/WebHost/config/cache.json
 delete mode 100644 src/WebHost/config/excel.Development.json
 delete mode 100644 src/WebHost/config/excel.json
 delete mode 100644 src/WebHost/config/jwt.Development.json
 delete mode 100644 src/WebHost/config/jwt.json

diff --git a/build/module.build.targets b/build/module.build.targets
index 6218c98..4cd5729 100644
--- a/build/module.build.targets
+++ b/build/module.build.targets
@@ -1,19 +1,19 @@
 <Project>
 
-  <PropertyGroup>
-    <ModulesDir>_modules\$(Id)</ModulesDir>
-    <ModuleName>$(ModulesDir)\_module.json</ModuleName>
-    <ModuleInfo>{"Id": "$(Id)","Name":"$(Name)","Icon":"$(Icon)","Version":"$(Version)"}</ModuleInfo>
-  </PropertyGroup>
+	<PropertyGroup>
+		<ModulesDir>_modules\$(Id)_$(Code)</ModulesDir>
+		<ModuleName>$(ModulesDir)\_module.json</ModuleName>
+		<ModuleInfo>{"Id": "$(Id)","Name":"$(Name)","Code":"$(Code)","Icon":"$(Icon)","Version":"$(Version)","Description":"$(Description)"}</ModuleInfo>
+	</PropertyGroup>
 
-  <Target Name="ModulesBuild" AfterTargets="Build">
+	<Target Name="ModulesBuild" AfterTargets="Build">
 
-    <!--创建modules目录-->
-    <MakeDir Directories="$(ModulesDir)"/>
+		<!--创建modules目录-->
+		<MakeDir Directories="$(ModulesDir)"/>
 
-    <!--生成module.json文件，Note：项目需要生成两次，否则Nuget包中的文件不是最新的-->
-    <WriteLinesToFile File="$(ModuleName)" Overwrite="true" Lines="$(ModuleInfo)" />
+		<!--生成module.json文件，Note：项目需要生成两次，否则Nuget包中的文件不是最新的-->
+		<WriteLinesToFile File="$(ModuleName)" Overwrite="true" Lines="$(ModuleInfo)" />
 
-  </Target>
+	</Target>
 
 </Project>
\ No newline at end of file
diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index 006a41feedefcd5a72e3c0c22c8d4963c0a9051d..b7d5fec7632ecbcec514a9833e3aa2180b3c942f 100644
GIT binary patch
literal 159744
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

literal 180224
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

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index ca1df6b..e84f08d 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,23 +1,24 @@
 <Project>
-  <PropertyGroup>
-    <Id>CodeGenerator</Id>
-    <Name>代码生成</Name>
-    <Icon>develop</Icon>
-    <Authors>Oldli</Authors>
-    <Version>1.7.4</Version>
-    <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
-    <NoWarn>$(NoWarn);1591</NoWarn>
-    <LangVersion>Latest</LangVersion>
-    <RootNamespacePrefix>NetModular.Module.$(Id)</RootNamespacePrefix>
-    <AssemblyName>$(RootNamespacePrefix).$(MSBuildProjectName)</AssemblyName>
-    <RootNamespace>$(AssemblyName)</RootNamespace>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <!--设置打包路径-->
-    <PackageOutputPath>$(SolutionDir)\_packages</PackageOutputPath>
-    <Company>Oldli</Company>
-    <Copyright>Oldli</Copyright>
-    <PackageProjectUrl>https://docs.17mkh.com/</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/iamoldli/NetModular.Module.CodeGenerator</RepositoryUrl>
-  </PropertyGroup>
+	<PropertyGroup>
+		<Id>02</Id>
+		<Code>CodeGenerator</Code>
+		<Name>代码生成</Name>
+		<Icon>develop</Icon>
+		<Authors>Oldli</Authors>
+		<Version>1.7.5</Version>
+		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
+		<NoWarn>$(NoWarn);1591</NoWarn>
+		<LangVersion>Latest</LangVersion>
+		<RootNamespacePrefix>NetModular.Module.$(Code)</RootNamespacePrefix>
+		<AssemblyName>$(RootNamespacePrefix).$(MSBuildProjectName)</AssemblyName>
+		<RootNamespace>$(AssemblyName)</RootNamespace>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<!--设置打包路径-->
+		<PackageOutputPath>$(SolutionDir)\_packages</PackageOutputPath>
+		<Company>Oldli</Company>
+		<Copyright>Oldli</Copyright>
+		<PackageProjectUrl>https://docs.17mkh.com/</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/iamoldli/NetModular.Module.CodeGenerator</RepositoryUrl>
+	</PropertyGroup>
 </Project>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index af135d0..4d3a6dd 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.12" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.3" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.14" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.5" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Application/ModuleService/ModuleService.cs b/src/Library/Application/ModuleService/ModuleService.cs
index 1d11496..c1c90ac 100644
--- a/src/Library/Application/ModuleService/ModuleService.cs
+++ b/src/Library/Application/ModuleService/ModuleService.cs
@@ -5,6 +5,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
+using NetModular.Lib.Config.Abstractions;
+using NetModular.Lib.Config.Abstractions.Impl;
 using NetModular.Module.CodeGenerator.Application.ModuleService.ResultModels;
 using NetModular.Module.CodeGenerator.Application.ModuleService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Class;
@@ -34,10 +36,10 @@ public class ModuleService : IModuleService
         private readonly IModelPropertyRepository _modelPropertyRepository;
         private readonly IClassMethodRepository _classMethodRepository;
         private readonly CodeGeneratorDbContext _dbContext;
-        private readonly CodeGeneratorOptions _codeGeneratorOptions;
         private readonly NuGetHelper _nugetHelper;
+        private readonly IConfigProvider _configProvider;
 
-        public ModuleService(IModuleRepository repository, IMapper mapper, IClassRepository classRepository, IPropertyRepository propertyRepository, IEnumRepository enumRepository, IEnumItemRepository enumItemRepository, IModelPropertyRepository modelPropertyRepository, IClassMethodRepository classMethodRepository, CodeGeneratorDbContext dbContext, CodeGeneratorOptions codeGeneratorOptions, NuGetHelper nugetHelper)
+        public ModuleService(IModuleRepository repository, IMapper mapper, IClassRepository classRepository, IPropertyRepository propertyRepository, IEnumRepository enumRepository, IEnumItemRepository enumItemRepository, IModelPropertyRepository modelPropertyRepository, IClassMethodRepository classMethodRepository, CodeGeneratorDbContext dbContext, NuGetHelper nugetHelper, IConfigProvider configProvider)
         {
             _repository = repository;
             _mapper = mapper;
@@ -48,8 +50,8 @@ public ModuleService(IModuleRepository repository, IMapper mapper, IClassReposit
             _modelPropertyRepository = modelPropertyRepository;
             _classMethodRepository = classMethodRepository;
             _dbContext = dbContext;
-            _codeGeneratorOptions = codeGeneratorOptions;
             _nugetHelper = nugetHelper;
+            _configProvider = configProvider;
         }
 
         public async Task<IResultModel> Query(ModuleQueryModel model)
@@ -138,12 +140,19 @@ public async Task<IResultModel<ModuleBuildCodeResultModel>> BuildCode(Guid modul
             //创建模块生成对象
             var moduleBuildModel = _mapper.Map<ModuleBuildModel>(module);
 
-            moduleBuildModel.Prefix = _codeGeneratorOptions.Prefix;
-            moduleBuildModel.UiPrefix = _codeGeneratorOptions.UiPrefix;
+            var config = _configProvider.Get<CodeGeneratorConfig>();
+            moduleBuildModel.Prefix = config.Prefix;
+            moduleBuildModel.UiPrefix = config.UiPrefix;
 
             var id = Guid.NewGuid().ToString();
-            var rootPath = _codeGeneratorOptions.BuildCodePath;
-            var moduleFullName = $"{_codeGeneratorOptions.Prefix}.Module.{module.Code}";
+            var rootPath = config.BuildCodePath;
+            if (rootPath.IsNull())
+            {
+                var pathConfig = _configProvider.Get<PathConfig>();
+                rootPath = Path.Combine(pathConfig.TempPath, "CodeGenerator/BuildCode");
+            }
+
+            var moduleFullName = $"{config.Prefix}.Module.{module.Code}";
             var buildModel = new TemplateBuildModel
             {
                 RootPath = Path.Combine(rootPath, id, moduleFullName),
@@ -231,16 +240,18 @@ public async Task<IResultModel<ModuleBuildCodeResultModel>> BuildCode(Guid modul
             var builder = new DefaultTemplateBuilder();
             builder.Build(buildModel);
 
-            var outputPath = Path.Combine(rootPath, id);
-            ZipFile.CreateFromDirectory(outputPath, Path.Combine(rootPath, id + ".zip"));
+            var sourceDir = Path.Combine(rootPath, id);
+            var outputFile = Path.Combine(rootPath, id + ".zip");
+            ZipFile.CreateFromDirectory(sourceDir, outputFile);
 
             //删除临时文件
-            Directory.Delete(outputPath, true);
+            Directory.Delete(sourceDir, true);
 
             var resultModel = new ModuleBuildCodeResultModel
             {
                 Id = id,
-                Name = moduleBuildModel.Name + ".zip"
+                Name = moduleBuildModel.Name + ".zip",
+                ZipPath = outputFile
             };
 
             return result.Success(resultModel);
diff --git a/src/Library/Application/ModuleService/ResultModels/ModuleBuildCodeResultModel.cs b/src/Library/Application/ModuleService/ResultModels/ModuleBuildCodeResultModel.cs
index ce24226..9c5392f 100644
--- a/src/Library/Application/ModuleService/ResultModels/ModuleBuildCodeResultModel.cs
+++ b/src/Library/Application/ModuleService/ResultModels/ModuleBuildCodeResultModel.cs
@@ -8,5 +8,10 @@ public class ModuleBuildCodeResultModel
         public string Id { get; set; }
 
         public string Name { get; set; }
+
+        /// <summary>
+        /// 压缩文件路径
+        /// </summary>
+        public string ZipPath { get; set; }
     }
 }
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 1dbc1c2..80d610b 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.12" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.12" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.5" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.14" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.14" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.7" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/CodeGeneratorConfig.cs b/src/Library/Infrastructure/CodeGeneratorConfig.cs
new file mode 100644
index 0000000..8f0ff21
--- /dev/null
+++ b/src/Library/Infrastructure/CodeGeneratorConfig.cs
@@ -0,0 +1,22 @@
+using NetModular.Lib.Config.Abstractions;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure
+{
+    public class CodeGeneratorConfig : IConfig
+    {
+        /// <summary>
+        /// 生成代码存储路径
+        /// </summary>
+        public string BuildCodePath { get; set; }
+
+        /// <summary>
+        /// 模块前缀(后端命名空间)
+        /// </summary>
+        public string Prefix { get; set; } = "NetModular";
+
+        /// <summary>
+        /// 前端组件前缀
+        /// </summary>
+        public string UiPrefix { get; set; } = "Nm";
+    }
+}
diff --git a/src/Library/Infrastructure/CodeGeneratorOptions.cs b/src/Library/Infrastructure/CodeGeneratorOptions.cs
deleted file mode 100644
index bea541c..0000000
--- a/src/Library/Infrastructure/CodeGeneratorOptions.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System.IO;
-using NetModular.Lib.Options.Abstraction;
-using NetModular.Lib.Utils.Core.SystemConfig;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure
-{
-    public class CodeGeneratorOptions : IModuleOptions
-    {
-        private readonly SystemConfigModel _systemConfig;
-
-        private string _buildCodePath;
-
-        public CodeGeneratorOptions(SystemConfigModel systemConfig)
-        {
-            _systemConfig = systemConfig;
-        }
-
-        /// <summary>
-        /// 生成代码存储路径
-        /// </summary>
-        [ModuleOptionDefinition("生成代码存储路径", "默认保存在全局临时目录的CodeGenerator\\BuildCode路径下")]
-        public string BuildCodePath
-        {
-            get
-            {
-                if (_buildCodePath.IsNull())
-                {
-                    _buildCodePath = Path.Combine(_systemConfig.Path.TempPath, "CodeGenerator", "BuildCode");
-                }
-                else if (!Path.IsPathRooted(_buildCodePath))
-                {
-                    _buildCodePath = Path.Combine(_systemConfig.Path.TempPath, _buildCodePath);
-                }
-                return _buildCodePath;
-            }
-            set => _buildCodePath = value;
-        }
-
-        /// <summary>
-        /// 模块前缀(后端命名空间)
-        /// </summary>
-        [ModuleOptionDefinition("模块前缀", "该属性会作为后端命名空间前缀使用，如NetModular.Module.Admin")]
-        public string Prefix { get; set; } = "NetModular";
-
-        /// <summary>
-        /// 前端组件前缀
-        /// </summary>
-        [ModuleOptionDefinition("前端组件前缀", "前端组件前缀，如Nm，组件名称就是nm-list")]
-        public string UiPrefix { get; set; } = "Nm";
-
-        public IModuleOptions Copy()
-        {
-            return new CodeGeneratorOptions(_systemConfig)
-            {
-                BuildCodePath = BuildCodePath,
-                Prefix = Prefix,
-                UiPrefix = UiPrefix
-            };
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 5f1fc1a..b4e73dd 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -1,730 +1,640 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
-    <PackageReference Include="NetModular.Lib.Options.Abstraction" Version="1.9.4" />
-    <PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.7" />
-    <PackageReference Include="System.CodeDom" Version="4.7.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
+		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="1.9.0" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.10" />
+		<PackageReference Include="System.CodeDom" Version="4.7.0" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Domain\Domain.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\Domain\Domain.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Update="Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>ModuleServicesConfigurator.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\script\NpmInstall.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>NpmInstall.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\script\NpmPublish.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>NpmPublish.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\script\NpmUpdate.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>NpmUpdate.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt">
-      <LastGenOutput>PostgreSQLRepository.cs</LastGenOutput>
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\api\components\Entity.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Entity.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\api\Index.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Index.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\cache.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>cache.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\cacheDevelopment.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>cacheDevelopment.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\PublishScript.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>PublishScript.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\Module.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Module.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\Index.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Index.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\Main.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Main.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>SavePage.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\views\index\Cols.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Cols.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\views\index\Page.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Page.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\views\index\Index.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Index.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\store\Store.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Store.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\routes\Routes.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Routes.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\config\Config.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Config.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\components\Components.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Components.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\Browserslistrc.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Browserslistrc.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\Eslintrc.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Eslintrc.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\BabelConfig.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>BabelConfig.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\Package.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Package.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\PostcssConfig.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>PostcssConfig.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\VueConfig.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>VueConfig.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\Gitattributes.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Gitattributes.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\Solution.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Solution.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\build\ModuleBuildTargets.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>ModuleBuildTargets.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\Gitignore.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Gitignore.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\Readme.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Readme.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Domain\Csproj.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Csproj.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Domain\Entity.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Entity.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Domain\EntityExtend.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>EntityExtend.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>QueryModel.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Domain\Repository.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Repository.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Domain\EntityEnum.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>EntityEnum.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Infrastructure\Csproj.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Csproj.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>DbContext.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>SqlServerRepository.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>MySqlRepository.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>PostgreSQLRepository.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>SQLiteRepository.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Infrastructure\Options.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Options.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Application\Csproj.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Csproj.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Application\ServiceInterface.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>ServiceInterface.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Application\ServiceImpl.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>ServiceImpl.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>AddModel.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>UpdateModel.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Library\Application\MapperConfig.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>MapperConfig.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\cache.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>cache.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\cacheDevelopment.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>cacheDevelopment.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\excelDevelopment.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>excelDevelopment.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Web\Csproj.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Csproj.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Web\ModuleController.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>ModuleController.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Web\ModuleInitializer.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>ModuleInitializer.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\Web\Controllers\Controller.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Controller.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\Csproj.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Csproj.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\Program.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Program.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\Startup.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Startup.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\db.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>db.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\dbDevelopment.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>dbDevelopment.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\host.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>host.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\hostDevelopment.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>hostDevelopment.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\jwt.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>jwt.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\jwtDevelopment.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>jwtDevelopment.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\logging.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>logging.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\loggingDevelopment.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>loggingDevelopment.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\DirectoryBuildProps.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>DirectoryBuildProps.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\vscode\settings.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>settings.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\src\api\Index.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Index.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\UI\App\Prettierrc.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>Prettierrc.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\excel.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>excel.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Default\T4\src\WebHost\config\excelDevelopment.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>excelDevelopment.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<None Update="Templates\Default\T4\src\WebHost\Properties\LaunchSettings.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>LaunchSettings.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>ModuleServicesConfigurator.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt">
+			<LastGenOutput>PostgreSQLRepository.cs</LastGenOutput>
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\api\components\Entity.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Entity.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\api\Index.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Index.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\PublishScript.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>PublishScript.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\components\ConfigPage.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>ConfigPage.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\Module.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Module.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\Index.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Index.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\Main.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Main.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\views\components\SavePage.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>SavePage.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\views\index\Cols.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Cols.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\views\index\Page.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Page.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\views\index\Index.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Index.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\store\Store.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Store.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\routes\Routes.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Routes.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\config\Config.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Config.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\components\Components.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Components.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\Browserslistrc.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Browserslistrc.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\Eslintrc.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Eslintrc.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\BabelConfig.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>BabelConfig.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\Package.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Package.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\PostcssConfig.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>PostcssConfig.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\VueConfig.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>VueConfig.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\Gitattributes.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Gitattributes.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\Solution.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Solution.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\build\ModuleBuildTargets.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>ModuleBuildTargets.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\Gitignore.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Gitignore.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\Readme.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Readme.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Domain\Csproj.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Csproj.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Domain\Entity.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Entity.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Domain\EntityExtend.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>EntityExtend.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Domain\Models\QueryModel.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>QueryModel.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Domain\Repository.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Repository.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Domain\EntityEnum.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>EntityEnum.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Infrastructure\Csproj.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Csproj.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>DbContext.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>SqlServerRepository.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>MySqlRepository.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>PostgreSQLRepository.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>SQLiteRepository.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Infrastructure\Config.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Config.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Application\Csproj.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Csproj.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Application\ServiceInterface.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>ServiceInterface.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Application\ServiceImpl.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>ServiceImpl.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>AddModel.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>UpdateModel.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Library\Application\MapperConfig.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>MapperConfig.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Web\Csproj.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Csproj.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Web\ModuleController.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>ModuleController.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Web\ModuleInitializer.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>ModuleInitializer.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\Web\Controllers\Controller.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Controller.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\WebHost\Csproj.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Csproj.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\WebHost\Program.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Program.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\WebHost\Startup.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Startup.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\WebHost\config\db.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>db.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\WebHost\config\dbDevelopment.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>dbDevelopment.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\WebHost\config\host.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>host.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\WebHost\config\hostDevelopment.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>hostDevelopment.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\WebHost\config\logging.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>logging.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\WebHost\config\loggingDevelopment.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>loggingDevelopment.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\DirectoryBuildProps.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>DirectoryBuildProps.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\vscode\settings.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>settings.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\src\api\Index.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Index.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\UI\App\Prettierrc.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>Prettierrc.cs</LastGenOutput>
+		</None>
+	</ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
-  </ItemGroup>
+	<ItemGroup>
+		<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ModuleServicesConfigurator.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\script\NpmInstall.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>NpmInstall.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\script\NpmPublish.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>NpmPublish.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\script\NpmUpdate.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>NpmUpdate.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\build\WebBuildTargets.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>WebBuildTargets.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\Gitignore.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Gitignore.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\Readme.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Readme.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\Solution.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Solution.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\Gitattributes.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Gitattributes.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Domain\Csproj*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Domain\Entity.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Entity.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Domain\Models\QueryModel.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>QueryModel.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Domain\EntityExtend.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>EntityExtend.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Domain\Repository.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Repository.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Domain\EntityEnum.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>EntityEnum.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Csproj.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>DbContext.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>SqlServerRepository.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>MySqlRepository.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>PostgreSQLRepository.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>SQLiteRepository.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Application\Csproj.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Application\ServiceInterface.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ServiceInterface.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Application\ServiceImpl.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ServiceImpl.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Application\ViewModels\AddModel.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>AddModel.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>UpdateModel.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Application\MapperConfig.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>MapperConfig.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Web\Csproj.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Web\ModuleController.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ModuleController.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Web\ModuleInitializer.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ModuleInitializer.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Web\Controllers\Controller.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Controller.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\Csproj.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Csproj.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\Program.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Program.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\Startup.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Startup.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\appsettings.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>appsettings.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\appsettingsDevelopment.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>appsettingsDevelopment.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\db.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>db.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\dbDevelopment.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>dbDevelopment.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\host.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>host.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\hostDevelopment.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>hostDevelopment.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\jwt.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>jwt.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\jwtDevelopment.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>jwtDevelopment.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\module.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>module.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\moduleDevelopment.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>moduleDevelopment.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\logging.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>logging.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\loggingDevelopment.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>loggingDevelopment.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\DirectoryBuildTargets.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>DirectoryBuildTargets.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\DirectoryBuildProps.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>DirectoryBuildProps.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\vscode\settings.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>settings.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\VueConfig.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>VueConfig.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\PostcssConfig.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>PostcssConfig.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\Package.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Package.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\BabelConfig.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>BabelConfig.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\Eslintrc.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Eslintrc.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\EditorConfig.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>EditorConfig.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\Browserslistrc.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Browserslistrc.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\api\EntityApi.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>EntityApi.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\components\Components.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Components.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\config\Config.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Config.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\routes\Routes.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Routes.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\store\Store.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Store.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Index.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Index.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Cols.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Cols.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Page.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Page.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\Module.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Module.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\Index.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Index.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\Main.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Main.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\PublishScript.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>PublishScript.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\cache.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>cache.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\cacheDevelopment.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>cacheDevelopment.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\build\ModuleBuildTargets.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ModuleBuildTargets.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\api\Index.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Index.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\api\components\Entity.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Entity.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\Prettierrc.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Prettierrc.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\excel.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>excel.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\WebHost\config\excelDevelopment.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>excelDevelopment.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\Library\Infrastructure\Options.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Options.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\src\views\components\SavePage.*">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>SavePage.tt</DependentUpon>
-    </Compile>
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Update="Templates\Default\T4\src\WebHost\Properties\LaunchSettings.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>LaunchSettings.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Infrastructure\Config.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Config.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\components\ConfigPage.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>ConfigPage.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>ModuleServicesConfigurator.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\build\WebBuildTargets.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>WebBuildTargets.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\Gitignore.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Gitignore.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\Readme.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Readme.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\Solution.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Solution.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\Gitattributes.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Gitattributes.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Domain\Csproj*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Csproj.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Domain\Entity.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Entity.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Domain\Models\QueryModel.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>QueryModel.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Domain\EntityExtend.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>EntityExtend.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Domain\Repository.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Repository.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Domain\EntityEnum.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>EntityEnum.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Infrastructure\Csproj.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Csproj.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>DbContext.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>SqlServerRepository.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\MySqlRepository.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>MySqlRepository.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\PostgreSQLRepository.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>PostgreSQLRepository.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>SQLiteRepository.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Application\Csproj.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Csproj.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Application\ServiceInterface.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>ServiceInterface.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Application\ServiceImpl.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>ServiceImpl.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Application\ViewModels\AddModel.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>AddModel.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Application\ViewModels\UpdateModel.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>UpdateModel.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Library\Application\MapperConfig.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>MapperConfig.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Web\Csproj.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Csproj.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Web\ModuleController.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>ModuleController.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Web\ModuleInitializer.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>ModuleInitializer.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\Web\Controllers\Controller.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Controller.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\WebHost\Csproj.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Csproj.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\WebHost\Program.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Program.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\WebHost\Startup.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Startup.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\WebHost\appsettings.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>appsettings.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\WebHost\appsettingsDevelopment.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>appsettingsDevelopment.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\WebHost\config\db.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>db.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\WebHost\config\dbDevelopment.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>dbDevelopment.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\WebHost\config\host.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>host.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\WebHost\config\hostDevelopment.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>hostDevelopment.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\WebHost\config\logging.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>logging.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\WebHost\config\loggingDevelopment.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>loggingDevelopment.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\DirectoryBuildTargets.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>DirectoryBuildTargets.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\DirectoryBuildProps.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>DirectoryBuildProps.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\vscode\settings.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>settings.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\VueConfig.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>VueConfig.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\PostcssConfig.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>PostcssConfig.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\Package.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Package.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\BabelConfig.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>BabelConfig.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\Eslintrc.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Eslintrc.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\Browserslistrc.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Browserslistrc.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\api\EntityApi.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>EntityApi.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\components\Components.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Components.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\config\Config.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Config.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\routes\Routes.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Routes.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\store\Store.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Store.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Index.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Index.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Cols.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Cols.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Page.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Page.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\Module.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Module.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\Index.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Index.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\Main.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Main.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\PublishScript.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>PublishScript.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\build\ModuleBuildTargets.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>ModuleBuildTargets.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\api\Index.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Index.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\api\components\Entity.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Entity.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\Prettierrc.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Prettierrc.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\UI\App\src\views\components\SavePage.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>SavePage.tt</DependentUpon>
+		</Compile>
+	</ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Templates\Default\T4\src\UI\App\BabelConfig.cs">
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\Package.cs">
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Templates\Default\T4\src\UI\App\VueConfig.cs">
-      <DesignTime>True</DesignTime>
-    </Compile>
-  </ItemGroup>
+	<ItemGroup>
+	  <Compile Update="Templates\Default\T4\Solution.cs">
+	    <DesignTime>True</DesignTime>
+	  </Compile>
+	  <Compile Update="Templates\Default\T4\src\UI\App\src\components\ConfigPage.cs">
+	    <DesignTime>True</DesignTime>
+	  </Compile>
+	  <Compile Update="Templates\Default\T4\src\WebHost\Properties\LaunchSettings.cs">
+	    <DesignTime>True</DesignTime>
+	  </Compile>
+	</ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/NuGet/NuGetPackageVersions.cs b/src/Library/Infrastructure/NuGet/NuGetPackageVersions.cs
index e521aa1..caf4b23 100644
--- a/src/Library/Infrastructure/NuGet/NuGetPackageVersions.cs
+++ b/src/Library/Infrastructure/NuGet/NuGetPackageVersions.cs
@@ -19,12 +19,14 @@ public class NuGetPackageVersions
 
         public string Lib_Data_SqlServer { get; set; }
 
-        public string Lib_Options_Abstraction { get; set; }
+        public string Lib_Config_Abstractions { get; set; }
 
         public string Lib_Mapper_AutoMapper { get; set; }
 
         public string Lib_Auth_Web { get; set; }
 
+        public string Lib_Module_Abstractions { get; set; }
+
         public string Lib_Module_AspNetCore { get; set; }
 
         public string Lib_Validation_FluentValidation { get; set; }
diff --git a/src/Library/Infrastructure/NuGet/NugetHelper.cs b/src/Library/Infrastructure/NuGet/NugetHelper.cs
index 3a42a3d..f4377cc 100644
--- a/src/Library/Infrastructure/NuGet/NugetHelper.cs
+++ b/src/Library/Infrastructure/NuGet/NugetHelper.cs
@@ -4,7 +4,9 @@
 using System.Net.Http;
 using System.Reflection;
 using System.Threading.Tasks;
+using NetModular.Lib.Config.Abstractions;
 using NetModular.Lib.Utils.Core.Attributes;
+using Newtonsoft.Json;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.NuGet
 {
@@ -20,14 +22,14 @@ public class NuGetHelper
         private NuGetPackageVersions _versions;
         private DateTime _lastSearchTime = DateTime.Now;
 
-        public NuGetHelper(CodeGeneratorOptions options, IHttpClientFactory clientFactory)
+        public NuGetHelper(IConfigProvider configProvider, IHttpClientFactory clientFactory)
         {
             _client = clientFactory.CreateClient();
-
+            var config = configProvider.Get<CodeGeneratorConfig>();
             var properties = typeof(NuGetPackageVersions).GetProperties();
             foreach (var propertyInfo in properties)
             {
-                var name = $"{options.Prefix}.{propertyInfo.Name.Replace("_", ".")}";
+                var name = $"{config.Prefix}.{propertyInfo.Name.Replace("_", ".")}";
                 _infos.Add(name, propertyInfo);
             }
         }
@@ -70,7 +72,21 @@ public async Task<string> GetVersion(string packageId)
             var jsonStr = await _client.GetStringAsync(url);
             if (jsonStr.NotNull())
             {
-                return jsonStr.Substring(jsonStr.IndexOf("\"version\":\"", StringComparison.Ordinal) + 11, 5);
+                var model = JsonConvert.DeserializeAnonymousType(jsonStr, new
+                {
+                    data = new[]
+                    {
+                        new
+                        {
+                            Version = ""
+                        }
+                    }
+                });
+
+                if (model != null && model.data != null && model.data.Length > 0)
+                {
+                    return model.data[0].Version;
+                }
             }
 
             return "";
diff --git a/src/Library/Infrastructure/Repositories/CodeGeneratorDbContext.cs b/src/Library/Infrastructure/Repositories/CodeGeneratorDbContext.cs
index ee7805c..e5571df 100644
--- a/src/Library/Infrastructure/Repositories/CodeGeneratorDbContext.cs
+++ b/src/Library/Infrastructure/Repositories/CodeGeneratorDbContext.cs
@@ -1,12 +1,11 @@
-using System;
-using NetModular.Lib.Data.Abstractions;
+using NetModular.Lib.Data.Abstractions;
 using NetModular.Lib.Data.Core;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories
 {
     public class CodeGeneratorDbContext : DbContext
     {
-        public CodeGeneratorDbContext(IDbContextOptions options, IServiceProvider serviceProvider) : base(options, serviceProvider)
+        public CodeGeneratorDbContext(IDbContextOptions options) : base(options)
         {
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Gitattributes.cs b/src/Library/Infrastructure/Templates/Default/T4/Gitattributes.cs
index 599d771..58c7cb4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Gitattributes.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Gitattributes.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\Gitattributes.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\Gitattributes.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Gitattributes : GitattributesBase
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Gitignore.cs b/src/Library/Infrastructure/Templates/Default/T4/Gitignore.cs
index a213dc7..07ec56a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Gitignore.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Gitignore.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\Gitignore.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\Gitignore.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Gitignore : GitignoreBase
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Readme.cs b/src/Library/Infrastructure/Templates/Default/T4/Readme.cs
index eab27ed..0e3538d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Readme.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Readme.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\Readme.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\Readme.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Readme : ReadmeBase
     {
@@ -27,7 +27,7 @@ public virtual string TransformText()
         {
             this.Write("## ");
             
-            #line 2 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\Readme.tt"
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\Readme.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Name));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Solution.cs b/src/Library/Infrastructure/Templates/Default/T4/Solution.cs
index 59ed175..447d4bc 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Solution.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/Solution.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\Solution.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\Solution.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Solution : SolutionBase
     {
@@ -27,21 +27,21 @@ public virtual string TransformText()
         {
             this.Write("Microsoft Visual Studio Solution File, Format Version 12.00\r\n# Visual Studio Vers" +
                     "ion 16\r\nVisualStudioVersion = 16.0.28803.156\r\nMinimumVisualStudioVersion = 10.0." +
-                    "40219.1\r\nProject(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\") = \"src\", \"src\", \"{B4D" +
-                    "3AF99-D551-4B7A-82F3-CE0950FCAA08}\"\r\nEndProject\r\nProject(\"{2150E333-8FDC-42A3-94" +
-                    "74-1A3956D46DE8}\") = \"build\", \"build\", \"{9C10C55A-E7D4-45D0-B23D-39BE8BF8DE4A}\"\r" +
-                    "\n\tProjectSection(SolutionItems) = preProject\r\n\t\tsrc\\Directory.Build.props = src\\" +
-                    "Directory.Build.props\r\n\t\tbuild\\module.build.targets = build\\module.build.targets" +
-                    "\r\n\tEndProjectSection\r\nEndProject\r\nProject(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8" +
-                    "}\") = \"Library\", \"Library\", \"{E58182FC-0950-453F-8C3A-ABCB477C8A28}\"\r\nEndProject" +
-                    "\r\nProject(\"{9A19103F-16F7-4668-BE54-9A1E7A4F7556}\") = \"Domain\", \"src\\Library\\Dom" +
-                    "ain\\Domain.csproj\", \"{851F1CBB-A081-40C7-844F-842E0FAE0DF0}\"\r\nEndProject\r\nProjec" +
-                    "t(\"{9A19103F-16F7-4668-BE54-9A1E7A4F7556}\") = \"Infrastructure\", \"src\\Library\\Inf" +
-                    "rastructure\\Infrastructure.csproj\", \"{2277E74A-AE69-4392-A173-8ED4BD6EB11E}\"\r\nEn" +
-                    "dProject\r\nProject(\"{9A19103F-16F7-4668-BE54-9A1E7A4F7556}\") = \"Web\", \"src\\Web\\We" +
-                    "b.csproj\", \"{C2D01E40-4038-4527-9AAF-323359CD5CF0}\"\r\nEndProject\r\nProject(\"{9A191" +
-                    "03F-16F7-4668-BE54-9A1E7A4F7556}\") = \"WebHost\", \"src\\WebHost\\WebHost.csproj\", \"{" +
-                    "CEAE0B43-438D-4778-BF3A-8665246EF718}\"\r\nEndProject\r\nProject(\"{9A19103F-16F7-4668" +
+                    "40219.1\r\nProject(\"{9A19103F-16F7-4668-BE54-9A1E7A4F7556}\") = \"WebHost\", \"src\\Web" +
+                    "Host\\WebHost.csproj\", \"{CEAE0B43-438D-4778-BF3A-8665246EF718}\"\r\nEndProject\r\nProj" +
+                    "ect(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\") = \"src\", \"src\", \"{B4D3AF99-D551-4B" +
+                    "7A-82F3-CE0950FCAA08}\"\r\nEndProject\r\nProject(\"{2150E333-8FDC-42A3-9474-1A3956D46D" +
+                    "E8}\") = \"build\", \"build\", \"{9C10C55A-E7D4-45D0-B23D-39BE8BF8DE4A}\"\r\n\tProjectSect" +
+                    "ion(SolutionItems) = preProject\r\n\t\tsrc\\Directory.Build.props = src\\Directory.Bui" +
+                    "ld.props\r\n\t\tbuild\\module.build.targets = build\\module.build.targets\r\n\tEndProject" +
+                    "Section\r\nEndProject\r\nProject(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\") = \"Librar" +
+                    "y\", \"Library\", \"{E58182FC-0950-453F-8C3A-ABCB477C8A28}\"\r\nEndProject\r\nProject(\"{9" +
+                    "A19103F-16F7-4668-BE54-9A1E7A4F7556}\") = \"Domain\", \"src\\Library\\Domain\\Domain.cs" +
+                    "proj\", \"{851F1CBB-A081-40C7-844F-842E0FAE0DF0}\"\r\nEndProject\r\nProject(\"{9A19103F-" +
+                    "16F7-4668-BE54-9A1E7A4F7556}\") = \"Infrastructure\", \"src\\Library\\Infrastructure\\I" +
+                    "nfrastructure.csproj\", \"{2277E74A-AE69-4392-A173-8ED4BD6EB11E}\"\r\nEndProject\r\nPro" +
+                    "ject(\"{9A19103F-16F7-4668-BE54-9A1E7A4F7556}\") = \"Web\", \"src\\Web\\Web.csproj\", \"{" +
+                    "C2D01E40-4038-4527-9AAF-323359CD5CF0}\"\r\nEndProject\r\nProject(\"{9A19103F-16F7-4668" +
                     "-BE54-9A1E7A4F7556}\") = \"Application\", \"src\\Library\\Application\\Application.cspr" +
                     "oj\", \"{792B8CBF-AB02-4A87-AB5E-A6CB8E9DE39C}\"\r\nEndProject\r\nProject(\"{2150E333-8F" +
                     "DC-42A3-9474-1A3956D46DE8}\") = \"Solution Items\", \"Solution Items\", \"{9BD68FC4-FD" +
diff --git a/src/Library/Infrastructure/Templates/Default/T4/Solution.tt b/src/Library/Infrastructure/Templates/Default/T4/Solution.tt
index 82a5172..78f866b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/Solution.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/Solution.tt
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.156
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebHost", "src\WebHost\WebHost.csproj", "{CEAE0B43-438D-4778-BF3A-8665246EF718}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B4D3AF99-D551-4B7A-82F3-CE0950FCAA08}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{9C10C55A-E7D4-45D0-B23D-39BE8BF8DE4A}"
@@ -19,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Infrastructure", "src\Libra
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web", "src\Web\Web.csproj", "{C2D01E40-4038-4527-9AAF-323359CD5CF0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebHost", "src\WebHost\WebHost.csproj", "{CEAE0B43-438D-4778-BF3A-8665246EF718}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application", "src\Library\Application\Application.csproj", "{792B8CBF-AB02-4A87-AB5E-A6CB8E9DE39C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9BD68FC4-FDB1-42F6-892A-0E752711A5BF}"
diff --git a/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.cs b/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.cs
index 7032557..6b57b95 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.cs
@@ -27,21 +27,21 @@ public virtual string TransformText()
         {
             this.Write(@"<Project>
 
-  <PropertyGroup>
-    <ModulesDir>_modules\$(Id)</ModulesDir>
-    <ModuleName>$(ModulesDir)\_module.json</ModuleName>
-    <ModuleInfo>{""Id"": ""$(Id)"",""Name"":""$(Name)"",""Icon"":""$(Icon)"",""Version"":""$(Version)""}</ModuleInfo>
-  </PropertyGroup>
+	<PropertyGroup>
+		<ModulesDir>_modules\$(Id)_$(Code)</ModulesDir>
+		<ModuleName>$(ModulesDir)\_module.json</ModuleName>
+		<ModuleInfo>{""Id"": ""$(Id)"",""Name"":""$(Name)"",""Code"":""$(Code)"",""Icon"":""$(Icon)"",""Version"":""$(Version)"",""Description"":""$(Description)""}</ModuleInfo>
+	</PropertyGroup>
 
-  <Target Name=""ModulesBuild"" AfterTargets=""Build"">
+	<Target Name=""ModulesBuild"" AfterTargets=""Build"">
 
-    <!--����modulesĿ¼-->
-    <MakeDir Directories=""$(ModulesDir)""/>
+		<!--����modulesĿ¼-->
+		<MakeDir Directories=""$(ModulesDir)""/>
 
-    <!--����module.json�ļ���Note����Ŀ��Ҫ�������Σ�����Nuget���е��ļ��������µ�-->
-    <WriteLinesToFile File=""$(ModuleName)"" Overwrite=""true"" Lines=""$(ModuleInfo)"" />
+		<!--����module.json�ļ���Note����Ŀ��Ҫ�������Σ�����Nuget���е��ļ��������µ�-->
+		<WriteLinesToFile File=""$(ModuleName)"" Overwrite=""true"" Lines=""$(ModuleInfo)"" />
 
-  </Target>
+	</Target>
 
 </Project>");
             return this.GenerationEnvironment.ToString();
diff --git a/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.tt b/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.tt
index 6218c98..4cd5729 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/build/ModuleBuildTargets.tt
@@ -1,19 +1,19 @@
 <Project>
 
-  <PropertyGroup>
-    <ModulesDir>_modules\$(Id)</ModulesDir>
-    <ModuleName>$(ModulesDir)\_module.json</ModuleName>
-    <ModuleInfo>{"Id": "$(Id)","Name":"$(Name)","Icon":"$(Icon)","Version":"$(Version)"}</ModuleInfo>
-  </PropertyGroup>
+	<PropertyGroup>
+		<ModulesDir>_modules\$(Id)_$(Code)</ModulesDir>
+		<ModuleName>$(ModulesDir)\_module.json</ModuleName>
+		<ModuleInfo>{"Id": "$(Id)","Name":"$(Name)","Code":"$(Code)","Icon":"$(Icon)","Version":"$(Version)","Description":"$(Description)"}</ModuleInfo>
+	</PropertyGroup>
 
-  <Target Name="ModulesBuild" AfterTargets="Build">
+	<Target Name="ModulesBuild" AfterTargets="Build">
 
-    <!--创建modules目录-->
-    <MakeDir Directories="$(ModulesDir)"/>
+		<!--创建modules目录-->
+		<MakeDir Directories="$(ModulesDir)"/>
 
-    <!--生成module.json文件，Note：项目需要生成两次，否则Nuget包中的文件不是最新的-->
-    <WriteLinesToFile File="$(ModuleName)" Overwrite="true" Lines="$(ModuleInfo)" />
+		<!--生成module.json文件，Note：项目需要生成两次，否则Nuget包中的文件不是最新的-->
+		<WriteLinesToFile File="$(ModuleName)" Overwrite="true" Lines="$(ModuleInfo)" />
 
-  </Target>
+	</Target>
 
 </Project>
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.Extend.cs
deleted file mode 100644
index c79e85e..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.Extend.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.script
-{
-    public partial class NpmInstall : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-
-        public NpmInstall(TemplateBuildModel model)
-        {
-            _model = model;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "script");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-
-            var filePath = Path.Combine(dir, "npm_install.ps1");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.cs
deleted file mode 100644
index af9b182..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     �˴����ɹ������ɡ�
-//     ����ʱ�汾: 16.0.0.0
-//  
-//     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
-//     �������ɴ��룬��Щ���Ľ��ᶪʧ��
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.script
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmInstall.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class NpmInstall : NpmInstallBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("cd ../src/UI/module-");
-            
-            #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmInstall.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.ToLower()));
-            
-            #line default
-            #line hidden
-            this.Write("\r\nnpm --registry  https://registry.npmjs.org/ install\r\npause");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class NpmInstallBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.tt b/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.tt
deleted file mode 100644
index 1761e57..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmInstall.tt
+++ /dev/null
@@ -1,3 +0,0 @@
-cd ../src/UI/module-<#= _model.Module.Code.ToLower() #>
-npm --registry  https://registry.npmjs.org/ install
-pause
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.Extend.cs
deleted file mode 100644
index dc0c1b5..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.Extend.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.script
-{
-   public partial class NpmPublish : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-
-        public NpmPublish(TemplateBuildModel model)
-        {
-            _model = model;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "script");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-
-            var filePath = Path.Combine(dir, "npm_publish.ps1");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.tt b/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.tt
deleted file mode 100644
index a6f3e24..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.tt
+++ /dev/null
@@ -1,3 +0,0 @@
-cd ../src/UI/module-<#= _model.Module.Code.ToLower() #>
-npm --registry  https://registry.npmjs.org/ publish
-pause
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.Extend.cs
deleted file mode 100644
index 231f1a0..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.Extend.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.script
-{
-    public partial class NpmUpdate : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-
-        public NpmUpdate(TemplateBuildModel model)
-        {
-            _model = model;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "script");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-
-            var filePath = Path.Combine(dir, "npm_update.ps1");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.cs b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.cs
deleted file mode 100644
index f8c7174..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     �˴����ɹ������ɡ�
-//     ����ʱ�汾: 16.0.0.0
-//  
-//     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
-//     �������ɴ��룬��Щ���Ľ��ᶪʧ��
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.script
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmUpdate.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class NpmUpdate : NpmUpdateBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("cd ../src/UI/module-");
-            
-            #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmUpdate.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.ToLower()));
-            
-            #line default
-            #line hidden
-            this.Write("\r\nnpm --registry  https://registry.npmjs.org/ update\r\npause");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class NpmUpdateBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.tt b/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.tt
deleted file mode 100644
index c2d96cd..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmUpdate.tt
+++ /dev/null
@@ -1,3 +0,0 @@
-cd ../src/UI/module-<#= _model.Module.Code.ToLower() #>
-npm --registry  https://registry.npmjs.org/ update
-pause
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
index 8273f4e..7ecc09b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
@@ -28,34 +28,41 @@ public virtual string TransformText()
             this.Write("<Project>\r\n  <PropertyGroup>\r\n    <Id>");
             
             #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.No<10 ? "0" + _model.Module.No : _model.Module.No + ""));
             
             #line default
             #line hidden
-            this.Write("</Id>\r\n    <Name>");
+            this.Write("</Id>\r\n    <Code>");
             
             #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
+            
+            #line default
+            #line hidden
+            this.Write("</Code>\r\n\t<Name>");
+            
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Name));
             
             #line default
             #line hidden
             this.Write("</Name>\r\n    <Authors>Oldli</Authors>\r\n    <Icon>");
             
-            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Icon));
             
             #line default
             #line hidden
-            this.Write("</Icon>\r\n    <Version>1.0.0</Version>\r\n    <Description>NetModular Module $(Id)($" +
-                    "(Name)) - $(MSBuildProjectName)</Description>\r\n    <NoWarn>$(NoWarn);1591</NoWar" +
-                    "n>\r\n    <LangVersion>Latest</LangVersion>\r\n    <RootNamespacePrefix>");
+            this.Write("</Icon>\r\n    <Version>1.0.0</Version>\r\n    <Description>NetModular Module $(Code)" +
+                    "($(Name)) - $(MSBuildProjectName)</Description>\r\n    <NoWarn>$(NoWarn);1591</NoW" +
+                    "arn>\r\n    <LangVersion>Latest</LangVersion>\r\n    <RootNamespacePrefix>");
             
-            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(@".Module.$(Id)</RootNamespacePrefix>
+            this.Write(@".Module.$(Code)</RootNamespacePrefix>
     <AssemblyName>$(RootNamespacePrefix).$(MSBuildProjectName)</AssemblyName>
     <RootNamespace>$(AssemblyName)</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -64,28 +71,28 @@ public virtual string TransformText()
     <PackageOutputPath>$(SolutionDir)\_packages</PackageOutputPath>
     <Company>");
             
-            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 20 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_company));
             
             #line default
             #line hidden
             this.Write("</Company>\r\n    <Copyright>");
             
-            #line 20 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 21 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_copyright));
             
             #line default
             #line hidden
             this.Write("</Copyright>\r\n    <PackageProjectUrl>");
             
-            #line 21 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 22 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_projectUrl));
             
             #line default
             #line hidden
             this.Write("</PackageProjectUrl>\r\n    <RepositoryUrl>");
             
-            #line 22 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 23 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_repositoryUrl));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
index 8fb6050..adacf30 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
@@ -1,15 +1,16 @@
 <#@ template language="C#" #>
 <Project>
   <PropertyGroup>
-    <Id><#= _model.Module.Code #></Id>
-    <Name><#= _model.Module.Name #></Name>
+    <Id><#= _model.Module.No<10 ? "0" + _model.Module.No : _model.Module.No + "" #></Id>
+    <Code><#= _model.Module.Code #></Code>
+	<Name><#= _model.Module.Name #></Name>
     <Authors>Oldli</Authors>
     <Icon><#= _model.Module.Icon #></Icon>
     <Version>1.0.0</Version>
-    <Description>NetModular Module $(Id)($(Name)) - $(MSBuildProjectName)</Description>
+    <Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <LangVersion>Latest</LangVersion>
-    <RootNamespacePrefix><#= _prefix #>.Module.$(Id)</RootNamespacePrefix>
+    <RootNamespacePrefix><#= _prefix #>.Module.$(Code)</RootNamespacePrefix>
     <AssemblyName>$(RootNamespacePrefix).$(MSBuildProjectName)</AssemblyName>
     <RootNamespace>$(AssemblyName)</RootNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.cs
index a41345b..fc087d0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/MapperConfig.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class MapperConfig : MapperConfigBase
     {
@@ -27,70 +27,70 @@ public virtual string TransformText()
         {
             this.Write("using AutoMapper;\r\nusing ");
             
-            #line 3 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 3 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Mapper.AutoMapper;\r\nusing ");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Application.");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service.ViewModels;\r\nusing ");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write(";\r\n\r\nnamespace ");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Application.");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
@@ -99,42 +99,42 @@ public virtual string TransformText()
                     "void Bind(IMapperConfigurationExpression cfg)\r\n        {\r\n            cfg.Create" +
                     "Map<");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("AddModel, ");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Entity>();\r\n            cfg.CreateMap<");
             
-            #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Entity, ");
             
-            #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("UpdateModel>();\r\n            cfg.CreateMap<");
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("UpdateModel, ");
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\MapperConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.cs
index 62d64a8..97a6c36 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceImpl.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class ServiceImpl : ServiceImplBase
     {
@@ -28,105 +28,105 @@ public virtual string TransformText()
             this.Write("using System;\r\nusing System.Linq;\r\nusing System.Threading.Tasks;\r\nusing AutoMappe" +
                     "r;\r\nusing ");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Utils.Core.Result;\r\nusing ");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Application.");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service.ViewModels;\r\nusing ");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write(";\r\nusing ");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write(".Models;\r\n\r\nnamespace ");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Application.");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service\r\n{\r\n    public class ");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service : I");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
@@ -134,21 +134,21 @@ public virtual string TransformText()
             this.Write("Service\r\n    {\r\n        private readonly IMapper _mapper;\r\n        private readon" +
                     "ly I");
             
-            #line 16 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Repository _repository;\r\n        public ");
             
-            #line 17 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service(IMapper mapper, I");
             
-            #line 17 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
@@ -156,21 +156,21 @@ public virtual string TransformText()
             this.Write("Repository repository)\r\n        {\r\n            _mapper = mapper;\r\n            _re" +
                     "pository = repository;\r\n        }\r\n\r\n");
             
-            #line 23 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 23 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
  if(_class.Method.Query) {
             
             #line default
             #line hidden
             this.Write("        public async Task<IResultModel> Query(");
             
-            #line 24 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 24 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("QueryModel model)\r\n        {\r\n            var result = new QueryResultModel<");
             
-            #line 26 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 26 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
@@ -179,27 +179,27 @@ public virtual string TransformText()
                     "               Total = model.TotalCount\r\n            };\r\n            return Resu" +
                     "ltModel.Success(result);\r\n        }\r\n\r\n");
             
-            #line 34 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 34 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
 } 
             
             #line default
             #line hidden
             
-            #line 35 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 35 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
  if(_class.Method.Add) {
             
             #line default
             #line hidden
             this.Write("        public async Task<IResultModel> Add(");
             
-            #line 36 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 36 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("AddModel model)\r\n        {\r\n            var entity = _mapper.Map<");
             
-            #line 38 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 38 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
@@ -216,20 +216,20 @@ public virtual string TransformText()
 
 ");
             
-            #line 48 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 48 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
 } 
             
             #line default
             #line hidden
             
-            #line 49 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 49 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
  if(_class.Method.Delete) {
             
             #line default
             #line hidden
             this.Write("        public async Task<IResultModel> Delete(");
             
-            #line 50 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 50 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.PrimaryKeyTypeName));
             
             #line default
@@ -237,20 +237,20 @@ public virtual string TransformText()
             this.Write(" id)\r\n        {\r\n            var result = await _repository.DeleteAsync(id);\r\n   " +
                     "         return ResultModel.Result(result);\r\n        }\r\n\r\n");
             
-            #line 56 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 56 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
 } 
             
             #line default
             #line hidden
             
-            #line 57 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 57 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
  if(_class.Method.Edit) {
             
             #line default
             #line hidden
             this.Write("        public async Task<IResultModel> Edit(");
             
-            #line 58 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 58 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.PrimaryKeyTypeName));
             
             #line default
@@ -259,7 +259,7 @@ public virtual string TransformText()
                     "      if (entity == null)\r\n                return ResultModel.NotExists;\r\n\r\n    " +
                     "        var model = _mapper.Map<");
             
-            #line 64 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 64 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
@@ -267,7 +267,7 @@ public virtual string TransformText()
             this.Write("UpdateModel>(entity);\r\n            return ResultModel.Success(model);\r\n        }\r" +
                     "\n\r\n        public async Task<IResultModel> Update(");
             
-            #line 68 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 68 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
@@ -291,7 +291,7 @@ public virtual string TransformText()
         }
 ");
             
-            #line 85 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
+            #line 85 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceImpl.tt"
 } 
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.cs
index cf76b4b..5d0ffcd 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ServiceInterface.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class ServiceInterface : ServiceInterfaceBase
     {
@@ -27,91 +27,91 @@ public virtual string TransformText()
         {
             this.Write("using System;\r\nusing System.Threading.Tasks;\r\nusing ");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Utils.Core.Result;\r\nusing ");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Application.");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service.ViewModels;\r\nusing ");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write(".Models;\r\n\r\nnamespace ");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Application.");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service\r\n{\r\n    /// <summary>\r\n    /// ");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Remarks));
             
             #line default
             #line hidden
             this.Write("服务\r\n    /// </summary>\r\n    public interface I");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service\r\n    {\r\n");
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
  if(_class.Method.Query) {
             
             #line default
@@ -120,20 +120,20 @@ public virtual string TransformText()
                     " name=\"model\"></param>\r\n        /// <returns></returns>\r\n        Task<IResultMod" +
                     "el> Query(");
             
-            #line 21 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 21 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("QueryModel model);\r\n\r\n");
             
-            #line 23 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 23 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
 } 
             
             #line default
             #line hidden
             
-            #line 24 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 24 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
  if(_class.Method.Add) {
             
             #line default
@@ -142,20 +142,20 @@ public virtual string TransformText()
                     " name=\"model\"></param>\r\n        /// <returns></returns>\r\n        Task<IResultMod" +
                     "el> Add(");
             
-            #line 30 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 30 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("AddModel model);\r\n\r\n");
             
-            #line 32 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 32 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
 } 
             
             #line default
             #line hidden
             
-            #line 33 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 33 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
  if(_class.Method.Delete) {
             
             #line default
@@ -164,20 +164,20 @@ public virtual string TransformText()
                     " name=\"id\">编号</param>\r\n        /// <returns></returns>\r\n        Task<IResultMode" +
                     "l> Delete(");
             
-            #line 39 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 39 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.PrimaryKeyTypeName));
             
             #line default
             #line hidden
             this.Write(" id);\r\n\r\n");
             
-            #line 41 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 41 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
 } 
             
             #line default
             #line hidden
             
-            #line 42 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 42 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
  if(_class.Method.Edit) {
             
             #line default
@@ -186,7 +186,7 @@ public virtual string TransformText()
                     " name=\"id\"></param>\r\n        /// <returns></returns>\r\n        Task<IResultModel>" +
                     " Edit(");
             
-            #line 48 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 48 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.PrimaryKeyTypeName));
             
             #line default
@@ -195,14 +195,14 @@ public virtual string TransformText()
                     "// <param name=\"model\"></param>\r\n        /// <returns></returns>\r\n        Task<I" +
                     "ResultModel> Update(");
             
-            #line 55 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 55 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("UpdateModel model);\r\n\r\n");
             
-            #line 57 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
+            #line 57 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ServiceInterface.tt"
 } 
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.cs
index 127bef4..049f813 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/ViewModels/AddModel.cs
@@ -17,7 +17,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class AddModel : AddModelBase
     {
@@ -29,91 +29,91 @@ public virtual string TransformText()
         {
             this.Write("using System;\r\nusing System.ComponentModel.DataAnnotations;\r\nusing ");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write(";\r\n\r\nnamespace ");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Application.");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Service.ViewModels\r\n{\r\n    /// <summary>\r\n    /// ");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Remarks));
             
             #line default
             #line hidden
             this.Write("添加模型\r\n    /// </summary>\r\n    public class ");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("AddModel\r\n    {\r\n");
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
  foreach(var p in _class.AddModelPropertyList){ 
             
             #line default
             #line hidden
             this.Write("        /// <summary>\r\n        /// ");
             
-            #line 17 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
             
             #line default
             #line hidden
             this.Write("\r\n        /// </summary>\r\n        public ");
             
-            #line 19 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Type == PropertyType.Enum ? p.Enum.Name : p.Type.ToDescription()));
             
             #line default
             #line hidden
             this.Write(" ");
             
-            #line 19 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Name));
             
             #line default
             #line hidden
             this.Write(" { get; set; }\r\n\r\n");
             
-            #line 21 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
+            #line 21 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\ViewModels\AddModel.tt"
  } 
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.cs
index 48c29d7..b5eb369 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityEnum.cs
@@ -16,7 +16,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class EntityEnum : EntityEnumBase
     {
@@ -28,82 +28,82 @@ public virtual string TransformText()
         {
             this.Write("using System.ComponentModel;\r\n\r\nnamespace ");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("\r\n{\r\n    /// <summary>\r\n    /// ");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_enum.Remarks));
             
             #line default
             #line hidden
             this.Write("\r\n    /// </summary>\r\n    public enum ");
             
-            #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_enum.Name));
             
             #line default
             #line hidden
             this.Write("\r\n    {\r\n");
             
-            #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
  for(var i=0;i<_enum.ItemList.Count;i++){ 
             
             #line default
             #line hidden
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
  var item = _enum.ItemList[i]; 
             
             #line default
             #line hidden
             this.Write("        [Description(\"");
             
-            #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
+            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(item.Remarks));
             
             #line default
             #line hidden
             this.Write("\")]\r\n        ");
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(item.Name));
             
             #line default
             #line hidden
             this.Write(" = ");
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(item.Value));
             
             #line default
             #line hidden
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(i == _enum.ItemList.Count - 1 ? "" : ","));
             
             #line default
             #line hidden
             this.Write("\r\n");
             
-            #line 16 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
+            #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityEnum.tt"
     } 
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.cs
index cf75a6a..1c06b21 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/EntityExtend.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityExtend.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityExtend.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class EntityExtend : EntityExtendBase
     {
@@ -27,28 +27,28 @@ public virtual string TransformText()
         {
             this.Write("namespace ");
             
-            #line 2 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityExtend.tt"
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityExtend.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 2 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityExtend.tt"
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityExtend.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 2 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityExtend.tt"
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityExtend.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("\r\n{\r\n    public partial class ");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityExtend.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\EntityExtend.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Config.Extend.cs
similarity index 87%
rename from src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.Extend.cs
rename to src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Config.Extend.cs
index ad88125..0838e6a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Config.Extend.cs
@@ -3,12 +3,12 @@
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.Library.Infrastructure
 {
-    public partial class Options : ITemplateHandler
+    public partial class Config : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
         private readonly string _prefix;
 
-        public Options(TemplateBuildModel model)
+        public Config(TemplateBuildModel model)
         {
             _model = model;
             _prefix = model.Module.Prefix;
@@ -23,7 +23,7 @@ public void Save()
                 Directory.CreateDirectory(dir);
 
             var content = TransformText();
-            var filePath = Path.Combine(dir, $"{_model.Module.Code}Options.cs");
+            var filePath = Path.Combine(dir, $"{_model.Module.Code}Config.cs");
             File.WriteAllText(filePath, content);
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Config.cs
similarity index 95%
rename from src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs
rename to src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Config.cs
index fa04897..df826c6 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Config.cs
@@ -15,9 +15,9 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Config.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class Options : OptionsBase
+    public partial class Config : ConfigBase
     {
 #line hidden
         /// <summary>
@@ -27,42 +27,40 @@ public virtual string TransformText()
         {
             this.Write("using ");
             
-            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options.tt"
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Config.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Lib.Options.Abstraction;\r\n\r\nnamespace ");
+            this.Write(".Lib.Config.Abstractions;\r\n\r\nnamespace ");
             
-            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Config.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Config.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Infrastructure\r\n{\r\n    /// <summary>\r\n    /// ");
             
-            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Config.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Name));
             
             #line default
             #line hidden
             this.Write("配置项\r\n    /// </summary>\r\n    public class ");
             
-            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Options.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Config.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
-            this.Write("Options : IModuleOptions\r\n    {\r\n        public IModuleOptions Copy()\r\n        {\r" +
-                    "\n            throw new System.NotImplementedException(\"请实现当前类的深度复制功能，并返回新的对象。\");" +
-                    "\r\n        }\r\n    }\r\n}\r\n");
+            this.Write("Config : IConfig\r\n    {\r\n        \r\n    }\r\n}\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
@@ -74,7 +72,7 @@ public virtual string TransformText()
     /// Base class for this transformation
     /// </summary>
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class OptionsBase
+    public class ConfigBase
     {
         #region Fields
         private global::System.Text.StringBuilder generationEnvironmentField;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Config.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Config.tt
new file mode 100644
index 0000000..0c8f726
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Config.tt
@@ -0,0 +1,13 @@
+<#@ template language="C#" #>
+using <#= _prefix #>.Lib.Config.Abstractions;
+
+namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Infrastructure
+{
+    /// <summary>
+    /// <#= _model.Module.Name #>配置项
+    /// </summary>
+    public class <#= _model.Module.Code #>Config : IConfig
+    {
+        
+    }
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
index a1196de..8fb6d53 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
@@ -34,23 +34,37 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Lib.Options.Abstraction\" Version=\"");
+            this.Write(".Lib.Config.Abstractions\" Version=\"");
             
             #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Options_Abstraction));
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Config_Abstractions));
             
             #line default
             #line hidden
-            this.Write("\" />\r\n    <PackageReference Include=\"");
+            this.Write("\" />\r\n\t  <PackageReference Include=\"");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write(".Module.Admin.Domain\" Version=\"");
+            this.Write(".Lib.Module.Abstractions\" Version=\"");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Module_Abstractions));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
+            
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            
+            #line default
+            #line hidden
+            this.Write(".Module.Admin.Domain\" Version=\"");
+            
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Module_Admin_Domain));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
index 89ca607..fc29504 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
@@ -6,7 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="<#= _prefix #>.Lib.Options.Abstraction" Version="<#= _versions.Lib_Options_Abstraction #>" />
+    <PackageReference Include="<#= _prefix #>.Lib.Config.Abstractions" Version="<#= _versions.Lib_Config_Abstractions #>" />
+	  <PackageReference Include="<#= _prefix #>.Lib.Module.Abstractions" Version="<#= _versions.Lib_Module_Abstractions #>" />
     <PackageReference Include="<#= _prefix #>.Module.Admin.Domain" Version="<#= _versions.Module_Admin_Domain #>" />
   </ItemGroup>
  
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt
deleted file mode 100644
index 533defd..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Options.tt
+++ /dev/null
@@ -1,16 +0,0 @@
-<#@ template language="C#" #>
-using <#= _prefix #>.Lib.Options.Abstraction;
-
-namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Infrastructure
-{
-    /// <summary>
-    /// <#= _model.Module.Name #>配置项
-    /// </summary>
-    public class <#= _model.Module.Code #>Options : IModuleOptions
-    {
-        public IModuleOptions Copy()
-        {
-            throw new System.NotImplementedException("请实现当前类的深度复制功能，并返回新的对象。");
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.cs
index 08a1a55..e2e4f8c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class DbContext : DbContextBase
     {
@@ -25,50 +25,50 @@ public partial class DbContext : DbContextBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("using System;\r\nusing ");
+            this.Write("using ");
             
-            #line 3 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Abstractions;\r\nusing ");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
+            #line 3 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Core;\r\n\r\nnamespace ");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Infrastructure.Repositories\r\n{\r\n    public class ");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write("DbContext : DbContext\r\n    {\r\n        public ");
             
-            #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\DbContext.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
-            this.Write("DbContext(IDbContextOptions options, IServiceProvider serviceProvider) : base(opt" +
-                    "ions, serviceProvider)\r\n        {\r\n        }\r\n    }\r\n}\r\n");
+            this.Write("DbContext(IDbContextOptions options) : base(options)\r\n        {\r\n        }\r\n    }" +
+                    "\r\n}\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.tt
index bb3c525..576cd50 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/DbContext.tt
@@ -1,5 +1,4 @@
 <#@ template language="C#" #>
-using System;
 using <#= _prefix #>.Lib.Data.Abstractions;
 using <#= _prefix #>.Lib.Data.Core;
 
@@ -7,7 +6,7 @@ namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Infrastructure.Reposit
 {
     public class <#= _model.Module.Code #>DbContext : DbContext
     {
-        public <#= _model.Module.Code #>DbContext(IDbContextOptions options, IServiceProvider serviceProvider) : base(options, serviceProvider)
+        public <#= _model.Module.Code #>DbContext(IDbContextOptions options) : base(options)
         {
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.cs
index 9d942bd..2f8fb99 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SQLiteRepository.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class SQLiteRepository : SQLiteRepositoryBase
     {
@@ -27,42 +27,42 @@ public virtual string TransformText()
         {
             this.Write("using ");
             
-            #line 2 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Abstractions;\r\n\r\nnamespace ");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Infrastructure.Repositories.SQLite\r\n{\r\n    public class ");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Repository : SqlServer.");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Repository\r\n    {\r\n        public ");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SQLiteRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.cs
index 8a8794e..463b9a2 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Repositories/SqlServerRepository.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class SqlServerRepository : SqlServerRepositoryBase
     {
@@ -28,126 +28,126 @@ public virtual string TransformText()
             this.Write("using System.Collections.Generic;\r\nusing System.Linq;\r\nusing System.Threading.Tas" +
                     "ks;\r\nusing ");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Abstractions;\r\nusing ");
             
-            #line 6 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Core;\r\nusing ");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Query;\r\n");
             
-            #line 8 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
  if(_class.IsEntityBase){ 
             
             #line default
             #line hidden
             this.Write("using ");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.Admin.Domain.Account;\r\n");
             
-            #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
  } 
             
             #line default
             #line hidden
             this.Write("using ");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write(";\r\nusing ");
             
-            #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Domain.");
             
-            #line 12 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write(".Models;\r\n\r\nnamespace ");
             
-            #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Infrastructure.Repositories.SqlServer\r\n{\r\n    public class ");
             
-            #line 16 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Repository : RepositoryAbstract<");
             
-            #line 16 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Entity>, I");
             
-            #line 16 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Repository\r\n    {\r\n        public ");
             
-            #line 18 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 18 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
@@ -155,14 +155,14 @@ public virtual string TransformText()
             this.Write("Repository(IDbContext context) : base(context)\r\n        {\r\n        }\r\n\r\n        p" +
                     "ublic async Task<IList<");
             
-            #line 22 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 22 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
             #line hidden
             this.Write("Entity>> Query(");
             
-            #line 22 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 22 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.Name));
             
             #line default
@@ -170,7 +170,7 @@ public virtual string TransformText()
             this.Write("QueryModel model)\r\n        {\r\n            var paging = model.Paging();\r\n\r\n       " +
                     "     var query = Db.Find();\r\n\r\n");
             
-            #line 28 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 28 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
  if(_class.IsEntityBase){ 
             
             #line default
@@ -185,7 +185,7 @@ public virtual string TransformText()
             var result = await joinQuery.PaginationAsync(paging);
 ");
             
-            #line 37 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 37 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
  } else {
             
             #line default
@@ -194,7 +194,7 @@ public virtual string TransformText()
                     "rByDescending(m => m.Id);\r\n            }\r\n\r\n            var result = await query" +
                     ".PaginationAsync(paging);\r\n");
             
-            #line 44 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
+            #line 44 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Repositories\SqlServerRepository.tt"
  } 
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
index 723a00e..97c0001 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
@@ -26,37 +26,44 @@ public partial class Package : PackageBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("{\r\n  \"name\": \"");
+            this.Write("{\r\n  \"id\": ");
             
             #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.No));
+            
+            #line default
+            #line hidden
+            this.Write(",\r\n  \"name\": \"");
+            
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write("-module-");
             
-            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.ToLower()));
             
             #line default
             #line hidden
             this.Write("\",\r\n  \"version\": \"1.0.0\",\r\n  \"code\": \"");
             
-            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.FirstCharToLower()));
             
             #line default
             #line hidden
             this.Write("\",\r\n  \"title\": \"");
             
-            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Name));
             
             #line default
             #line hidden
             this.Write("\",\r\n  \"description\": \"");
             
-            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
+            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\Package.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Name));
             
             #line default
@@ -75,19 +82,19 @@ public virtual string TransformText()
     ""pub"": ""cd ../../../script && npm_publish.ps1""
   },
   ""dependencies"": {
-    ""netmodular-module-admin"": ""^1.2.9"",
-    ""netmodular-ui"": ""^1.7.6""
+    ""netmodular-module-admin"": ""^1.3.4"",
+    ""netmodular-ui"": ""^1.7.7""
   },
   ""devDependencies"": {
-    ""@vue/cli-plugin-babel"": ""^4.2.3"",
-    ""@vue/cli-plugin-eslint"": ""^4.2.3"",
-    ""@vue/cli-plugin-router"": ""^4.2.3"",
-    ""@vue/cli-plugin-vuex"": ""^4.2.3"",
-    ""@vue/cli-service"": ""^4.2.3"",
+    ""@vue/cli-plugin-babel"": ""^4.3.1"",
+    ""@vue/cli-plugin-eslint"": ""^4.3.1"",
+    ""@vue/cli-plugin-router"": ""^4.3.1"",
+    ""@vue/cli-plugin-vuex"": ""^4.3.1"",
+    ""@vue/cli-service"": ""^4.3.1"",
     ""@vue/eslint-config-prettier"": ""^5.0.0"",
     ""babel-eslint"": ""^10.1.0"",
     ""eslint"": ""^5.16.0"",
-    ""eslint-plugin-prettier"": ""^3.1.2"",
+    ""eslint-plugin-prettier"": ""^3.1.3"",
     ""eslint-plugin-vue"": ""^5.0.0"",
     ""prettier"": ""^1.18.2"",
     ""rimraf"": ""^3.0.2"",
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
index a4471b3..b13ebeb 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
@@ -1,6 +1,7 @@
 <#@ template language="C#" #>
 <#@ import namespace="NetModular.Lib.Utils.Core.Extensions" #>
 {
+  "id": <#= _model.Module.No #>,
   "name": "<#= _prefix #>-module-<#= _model.Module.Code.ToLower() #>",
   "version": "1.0.0",
   "code": "<#= _model.Module.Code.FirstCharToLower() #>",
@@ -19,19 +20,19 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.2.9",
-    "netmodular-ui": "^1.7.6"
+    "netmodular-module-admin": "^1.3.4",
+    "netmodular-ui": "^1.7.7"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.2.3",
-    "@vue/cli-plugin-eslint": "^4.2.3",
-    "@vue/cli-plugin-router": "^4.2.3",
-    "@vue/cli-plugin-vuex": "^4.2.3",
-    "@vue/cli-service": "^4.2.3",
+    "@vue/cli-plugin-babel": "^4.3.1",
+    "@vue/cli-plugin-eslint": "^4.3.1",
+    "@vue/cli-plugin-router": "^4.3.1",
+    "@vue/cli-plugin-vuex": "^4.3.1",
+    "@vue/cli-service": "^4.3.1",
     "@vue/eslint-config-prettier": "^5.0.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^5.16.0",
-    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-vue": "^5.0.0",
     "prettier": "^1.18.2",
     "rimraf": "^3.0.2",
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.cs
index 199f447..6b23df5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Index.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Index.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Index.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Index : IndexBase
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.cs
index bef627e..2da2a2d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Main.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Main.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Main.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Main : MainBase
     {
@@ -27,21 +27,21 @@ public virtual string TransformText()
         {
             this.Write("import WebHost from \'");
             
-            #line 2 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Main.tt"
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Main.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write("-module-admin\'\r\nimport config from \'./config\'\r\nimport ");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Main.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Main.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(" from \'./index\'\r\n\r\n// ע��ģ��\r\nWebHost.registerModule(");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Main.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Main.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.cs
index 0af7c67..2a99eea 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Module.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\Module.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Module : ModuleBase
     {
@@ -25,9 +25,9 @@ public partial class Module : ModuleBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("/** ģ����Ϣ */\r\nconst pack = require(\'../package.json\')\r\n\r\nexport default {\r\n  name:" +
-                    " pack.title,\r\n  code: pack.code,\r\n  version: pack.version,\r\n  description: pack." +
-                    "description\r\n}\r\n");
+            this.Write("/** ģ����Ϣ */\r\nconst pack = require(\'../package.json\')\r\n\r\nexport default {\r\n  id: p" +
+                    "ack.id,\r\n  name: pack.title,\r\n  code: pack.code,\r\n  version: pack.version,\r\n  de" +
+                    "scription: pack.description\r\n}\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.tt
index dcfce9a..5df51ff 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/Module.tt
@@ -3,6 +3,7 @@
 const pack = require('../package.json')
 
 export default {
+  id: pack.id,
   name: pack.title,
   code: pack.code,
   version: pack.version,
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.cs
index ee0647b..09c6309 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/api/Index.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\api\Index.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\api\Index.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Index : IndexBase
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
index 156e92c..11b9651 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.Extend.cs
@@ -7,13 +7,11 @@ public partial class Components : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
         private readonly string _prefix;
-        private readonly string _uiPrefix;
 
         public Components(TemplateBuildModel model)
         {
             _model = model;
             _prefix = _model.Module.Prefix.ToLower();
-            _uiPrefix = _model.Module.UiPrefix.ToLower();
         }
 
         public bool IsGlobal => true;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.cs
index 3dd0de4..83ab64c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\components\Components.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\components\Components.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Components : ComponentsBase
     {
@@ -25,15 +25,24 @@ public partial class Components : ComponentsBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("export default []\r\n\r\n/**  ȫ�����ע��ʾ��  */\r\n// import DictionarySelect from \'../views" +
-                    "/dictionary/select\'\r\n//\r\n// export default [{\r\n// //�������\r\n// name: \'");
+            this.Write("import library from \'");
             
-            #line 9 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\components\Components.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\components\Components.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
-            this.Write("-dictionary-select\',\r\n// //�������\r\n// component: DictionarySelect\r\n// }\r\n// ]\r\n");
+            this.Write(@"-ui/packages/library'
+let components = []
+const requireComponent = require.context('./', true, /index\.vue$/)
+requireComponent.keys().map(fileName => {
+  components.push({
+    name: `${library.prefix.toLowerCase()}-${fileName.split('/')[1]}`,
+    component: requireComponent(fileName).default
+  })
+})
+export default components
+");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.tt
index 177fb43..5e257e0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/Components.tt
@@ -1,13 +1,11 @@
 <#@ template language="C#" #>
-export default []
-
-/**  ȫ�����ע��ʾ��  */
-// import DictionarySelect from '../views/dictionary/select'
-//
-// export default [{
-// //�������
-// name: '<#= _uiPrefix #>-dictionary-select',
-// //�������
-// component: DictionarySelect
-// }
-// ]
+import library from '<#= _prefix #>-ui/packages/library'
+let components = []
+const requireComponent = require.context('./', true, /index\.vue$/)
+requireComponent.keys().map(fileName => {
+  components.push({
+    name: `${library.prefix.toLowerCase()}-${fileName.split('/')[1]}`,
+    component: requireComponent(fileName).default
+  })
+})
+export default components
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.Extend.cs
new file mode 100644
index 0000000..5475133
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.Extend.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App.src.components
+{
+    public partial class ConfigPage : ITemplateHandler
+    {
+        private readonly TemplateBuildModel _model;
+        private readonly string _prefix;
+        private readonly string _uiPrefix;
+
+        public ConfigPage(TemplateBuildModel model)
+        {
+            _model = model;
+            _prefix = _model.Module.Prefix.ToLower();
+            _uiPrefix = _model.Module.UiPrefix.ToLower();
+        }
+
+        public bool IsGlobal => true;
+
+        public void Save()
+        {
+            var dir = Path.Combine(_model.RootPath, $"src/UI/{_model.Module.WebUIDicName}/src/components/config-{_model.Module.Code.ToLower()}");
+            if (!Directory.Exists(dir))
+                Directory.CreateDirectory(dir);
+
+            var content = TransformText();
+            var filePath = Path.Combine(dir, "index.vue");
+            File.WriteAllText(filePath, content);
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.cs
similarity index 94%
rename from src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.cs
rename to src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.cs
index 9937453..682bfee 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.cs
@@ -7,7 +7,7 @@
 //     �������ɴ��룬��Щ���Ľ��ᶪʧ��
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.UI.App.src.components
 {
     using System;
     
@@ -15,9 +15,9 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\excelDevelopment.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\components\ConfigPage.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class excelDevelopment : excelDevelopmentBase
+    public partial class ConfigPage : ConfigPageBase
     {
 #line hidden
         /// <summary>
@@ -25,7 +25,27 @@ public partial class excelDevelopment : excelDevelopmentBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("{\r\n}");
+            this.Write(@"<template>
+  <nm-form-page v-bind=""form"">
+    <!--�����Զ������-->
+  </nm-form-page>
+</template>
+<script>
+import { mixins } from 'netmodular-module-admin'
+import module from '../../module'
+export default {
+  mixins: [mixins.configForm],
+  data() {
+    return {
+      code: module.code,
+      form: {
+        model: {}
+      }
+    }
+  }
+}
+</script>
+");
             return this.GenerationEnvironment.ToString();
         }
     }
@@ -37,7 +57,7 @@ public virtual string TransformText()
     /// Base class for this transformation
     /// </summary>
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class excelDevelopmentBase
+    public class ConfigPageBase
     {
         #region Fields
         private global::System.Text.StringBuilder generationEnvironmentField;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.tt
new file mode 100644
index 0000000..355d6f3
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.tt
@@ -0,0 +1,21 @@
+<#@ template language="C#" #>
+<template>
+  <nm-form-page v-bind="form">
+    <!--这里自定义表单-->
+  </nm-form-page>
+</template>
+<script>
+import { mixins } from 'netmodular-module-admin'
+import module from '../../module'
+export default {
+  mixins: [mixins.configForm],
+  data() {
+    return {
+      code: module.code,
+      form: {
+        model: {}
+      }
+    }
+  }
+}
+</script>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.cs
index 745ac5c..5602d06 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\config\Config.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\config\Config.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Config : ConfigBase
     {
@@ -28,7 +28,7 @@ public virtual string TransformText()
             this.Write("const isDev = process.env.NODE_ENV !== \'production\'\r\n\r\nconst config = {\r\n  baseUr" +
                     "l: \'/api/\'\r\n}\r\n\r\n// ����ģʽ\r\nif (isDev) {\r\n  config.baseUrl = \'http://localhost:");
             
-            #line 10 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\config\Config.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\config\Config.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(6220 + _model.Module.No));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.tt
index cf2ca72..54a0ae0 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.tt
@@ -7,6 +7,6 @@ const config = {
 
 // 开发模式
 if (isDev) {
-  config.baseUrl = 'http://localhost:<#= 6220 + _model.Project.No #>/api/'
+  config.baseUrl = 'http://localhost:<#= 6220 + _model.Module.No #>/api/'
 }
 export default config
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.cs
index f496b4e..828d158 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/store/Store.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\store\Store.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\store\Store.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Store : StoreBase
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.cs
index 26fd8d3..707bf13 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Cols.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Cols : ColsBase
     {
@@ -27,60 +27,60 @@ public virtual string TransformText()
         {
             this.Write("export default [\r\n");
             
-            #line 3 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
+            #line 3 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
     for(var i = 0;i < _properties.Count;i++){ var p = _properties[i]; 
             
             #line default
             #line hidden
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
         if(p.Name == "Id"){ 
             
             #line default
             #line hidden
             this.Write("  {\r\n    name: \'id\',\r\n    label: \'���\',\r\n    width: 250,\r\n    show: false\r\n  },\r\n");
             
-            #line 11 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
+            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
       } else {
             
             #line default
             #line hidden
             this.Write("  {\r\n    name: \'");
             
-            #line 13 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
+            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.CamelName));
             
             #line default
             #line hidden
             this.Write("\',\r\n    label: \'");
             
-            #line 14 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
+            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(p.Remarks));
             
             #line default
             #line hidden
             this.Write("\'\r\n  }");
             
-            #line 15 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
+            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_class.IsEntityBase || i < _properties.Count - 1 ? ",":""));
             
             #line default
             #line hidden
             this.Write("\r\n");
             
-            #line 16 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
+            #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
      } 
             
             #line default
             #line hidden
             
-            #line 17 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
+            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
    } 
             
             #line default
             #line hidden
             
-            #line 18 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
+            #line 18 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
     if(_class.IsEntityBase){ 
             
             #line default
@@ -89,7 +89,7 @@ public virtual string TransformText()
                     " },\r\n  {\r\n    name: \'createdTime\',\r\n    label: \'����ʱ��\',\r\n    width: 150,\r\n    sho" +
                     "w: false\r\n  }\r\n");
             
-            #line 31 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
+            #line 31 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Cols.tt"
     } 
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.cs
index f184d0b..c69a26c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleController.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleController.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleController.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class ModuleController : ModuleControllerBase
     {
@@ -27,28 +27,28 @@ public virtual string TransformText()
         {
             this.Write("using Microsoft.AspNetCore.Mvc;\r\nusing ");
             
-            #line 3 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleController.tt"
+            #line 3 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleController.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Auth.Web;\r\n\r\nnamespace ");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleController.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleController.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleController.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleController.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".Web\r\n{\r\n    [Area(\"");
             
-            #line 7 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleController.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleController.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.cs
index 56039eb..4b86a3e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Program : ProgramBase
     {
@@ -27,21 +27,21 @@ public virtual string TransformText()
         {
             this.Write("using ");
             
-            #line 2 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
+            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Host.Web;\r\n\r\nnamespace ");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Properties/LaunchSettings.Extend.cs
similarity index 71%
rename from src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.Extend.cs
rename to src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Properties/LaunchSettings.Extend.cs
index 3024882..7cebabb 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Properties/LaunchSettings.Extend.cs
@@ -1,13 +1,13 @@
 using System.IO;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.Properties
 {
-    public partial class jwt : ITemplateHandler
+    public partial class LaunchSettings : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
 
-        public jwt(TemplateBuildModel model)
+        public LaunchSettings(TemplateBuildModel model)
         {
             _model = model;
         }
@@ -16,12 +16,12 @@ public jwt(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost/Properties/");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
             var content = TransformText();
-            var filePath = Path.Combine(dir, "jwt.json");
+            var filePath = Path.Combine(dir, "launchSettings.json");
             File.WriteAllText(filePath, content);
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Properties/LaunchSettings.cs
similarity index 93%
rename from src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.cs
rename to src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Properties/LaunchSettings.cs
index ea45d0e..d3e88a3 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/script/NpmPublish.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Properties/LaunchSettings.cs
@@ -7,7 +7,7 @@
 //     �������ɴ��룬��Щ���Ľ��ᶪʧ��
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.script
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.Properties
 {
     using System;
     
@@ -15,9 +15,9 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sc
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmPublish.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Properties\LaunchSettings.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class NpmPublish : NpmPublishBase
+    public partial class LaunchSettings : LaunchSettingsBase
     {
 #line hidden
         /// <summary>
@@ -25,14 +25,24 @@ public partial class NpmPublish : NpmPublishBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("cd ../src/UI/module-");
+            this.Write(@"{
+""$schema"": ""http://json.schemastore.org/launchsettings.json"",
+  ""profiles"": {
+    ""WebHost"": {
+      ""commandName"": ""Project"",
+      ""launchBrowser"": true,
+      ""launchUrl"": ""swagger"",
+      ""environmentVariables"": {
+        ""ASPNETCORE_ENVIRONMENT"": ""Development""
+      },
+      ""applicationUrl"": ""http://localhost:");
             
-            #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\script\NpmPublish.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code.ToLower()));
+            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Properties\LaunchSettings.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.No + 6220));
             
             #line default
             #line hidden
-            this.Write("\r\nnpm --registry  https://registry.npmjs.org/ publish\r\npause");
+            this.Write("\"\r\n    }\r\n  }\r\n}");
             return this.GenerationEnvironment.ToString();
         }
     }
@@ -44,7 +54,7 @@ public virtual string TransformText()
     /// Base class for this transformation
     /// </summary>
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class NpmPublishBase
+    public class LaunchSettingsBase
     {
         #region Fields
         private global::System.Text.StringBuilder generationEnvironmentField;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Properties/LaunchSettings.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Properties/LaunchSettings.tt
new file mode 100644
index 0000000..cae336a
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Properties/LaunchSettings.tt
@@ -0,0 +1,15 @@
+<#@ template language="C#" #>
+{
+"$schema": "http://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "WebHost": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:<#= _model.Module.No + 6220 #>"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs
index 50fbaaf..3eb96d4 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class Startup : StartupBase
     {
@@ -27,21 +27,21 @@ public virtual string TransformText()
         {
             this.Write("using Microsoft.Extensions.Hosting;\r\nusing ");
             
-            #line 3 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
+            #line 3 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Host.Web;\r\n\r\nnamespace ");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs
deleted file mode 100644
index d6fb821..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.Extend.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    public partial class cache : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-        private readonly string _prefix;
-
-        public cache(TemplateBuildModel model)
-        {
-            _model = model;
-            _prefix = model.Module.Prefix;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-            var filePath = Path.Combine(dir, "cache.json");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.cs
deleted file mode 100644
index 5e5325c..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.cs
+++ /dev/null
@@ -1,308 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本: 16.0.0.0
-//  
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\cache.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class cache : cacheBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("{\r\n  // 0、MemoryCache 1、Redis\r\n  \"Mode\": 0,\r\n  \"Redis\": {\r\n    \"ConnectionString\"" +
-                    ": \"127.0.0.1\"\r\n  }\r\n}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class cacheBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.tt
deleted file mode 100644
index ca2dd37..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cache.tt
+++ /dev/null
@@ -1,8 +0,0 @@
-<#@ template language="C#" #>
-{
-  // 0、MemoryCache 1、Redis
-  "Mode": 0,
-  "Redis": {
-    "ConnectionString": "127.0.0.1"
-  }
-}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs
deleted file mode 100644
index 14f7d45..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.Extend.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    public partial class cacheDevelopment : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-        private readonly string _prefix;
-
-        public cacheDevelopment(TemplateBuildModel model)
-        {
-            _model = model;
-            _prefix = model.Module.Prefix;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-            var filePath = Path.Combine(dir, "cache.Development.json");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.cs
deleted file mode 100644
index cbb3652..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本: 16.0.0.0
-//  
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\cacheDevelopment.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class cacheDevelopment : cacheDevelopmentBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("{}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class cacheDevelopmentBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.tt
deleted file mode 100644
index 22fdca1..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/cacheDevelopment.tt
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
index 48f76d6..86cabc1 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
@@ -26,30 +26,30 @@ public partial class db : dbBase
         public virtual string TransformText()
         {
             this.Write(@"{
-  //�Ƿ�����־
+  //????????
   ""Logging"": false,
-  //���ݿ����� 0��SqlServer 1��MySql 2��SQLite
+  //????????? 0??SqlServer 1??MySql 2??SQLite
   ""Dialect"": 2,
-  //���ݿ�汾
+  //?????��
   ""Version"": """",
-  //���ݿ��ַ
+  //???????
   ""Server"": """",
-  //�˿ں�
+  //????
   ""Port"": 0,
-  //�û���
+  //?????
   ""UserId"": """",
-  //����
+  //????
   ""Password"": """",
-  //�Ƿ񴴽����ݿ�ͱ�
+  //????????????
   ""CreateDatabase"": true,
-  //�Ƿ񴴽����ݿ���ʼ������
+  //???????????????????
   ""InitData"": true,
-  //ģ���б�
+  //????��?
   ""Modules"": [
     {
-      //ģ������
+      //???????
       ""Name"": ""Admin"",
-      //���ݿ�����
+      //?????????
       ""Database"": """);
             
             #line 27 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.cs
index 7b30312..b7e3865 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\dbDevelopment.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\dbDevelopment.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class dbDevelopment : dbDevelopmentBase
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.Extend.cs
deleted file mode 100644
index dfcf991..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.Extend.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    public partial class excel : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-
-        public excel(TemplateBuildModel model)
-        {
-            _model = model;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-            var filePath = Path.Combine(dir, "excel.json");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.cs
deleted file mode 100644
index 47a7a6f..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.cs
+++ /dev/null
@@ -1,308 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     �˴����ɹ������ɡ�
-//     ����ʱ�汾: 16.0.0.0
-//  
-//     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
-//     �������ɴ��룬��Щ���Ľ��ᶪʧ��
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\excel.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class excel : excelBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("{\r\n  //Excel������ 0��EPPlus 1��NPOI 2��OpenXml\r\n  \"Provider\": 0,\r\n  //Excel�����ʱ�ļ�·�����ƣ�" +
-                    "Ĭ��Excel����Ŀ¼�����ȫ�ֵ���ʱĿ¼��\r\n  \"TempPath\": \"\"\r\n}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class excelBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.tt
deleted file mode 100644
index d5221e1..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excel.tt
+++ /dev/null
@@ -1,7 +0,0 @@
-<#@ template language="C#" #>
-{
-  //Excel������ 0��EPPlus 1��NPOI 2��OpenXml
-  "Provider": 0,
-  //Excel�����ʱ�ļ�·�����ƣ�Ĭ��Excel����Ŀ¼�����ȫ�ֵ���ʱĿ¼��
-  "TempPath": ""
-}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.Extend.cs
deleted file mode 100644
index 4d88d31..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.Extend.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    public partial class excelDevelopment : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-
-        public excelDevelopment(TemplateBuildModel model)
-        {
-            _model = model;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-            var filePath = Path.Combine(dir, "excel.Development.json");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.tt
deleted file mode 100644
index 7a73a41..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/excelDevelopment.tt
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.cs
index e94f1c1..3005c53 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\host.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\host.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class host : hostBase
     {
@@ -27,7 +27,7 @@ public virtual string TransformText()
         {
             this.Write("{\r\n    //地址\r\n    \"Urls\": \"http://*:");
             
-            #line 4 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\host.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\host.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.No + 6220));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.cs
index 01d9707..80ae20e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.cs
@@ -9,11 +9,13 @@
 // ------------------------------------------------------------------------------
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
 {
+    using System;
+    
     /// <summary>
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\src\Module\CodeGenerator\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\hostDevelopment.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\hostDevelopment.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class hostDevelopment : hostDevelopmentBase
     {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.cs
deleted file mode 100644
index 567bbbe..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     �˴����ɹ������ɡ�
-//     ����ʱ�汾: 16.0.0.0
-//  
-//     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
-//     �������ɴ��룬��Щ���Ľ��ᶪʧ��
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\jwt.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class jwt : jwtBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("{\r\n  //��Կ\r\n  \"Key\": \"twAJ$j5##pVc5*y&\",\r\n  //������\r\n  \"Issuer\": \"http://www.17mkh.c" +
-                    "om\",\r\n  //������\r\n  \"Audience\": \"http://www.17mkh.com\",\r\n  //����(����)\r\n  \"Expires\": " +
-                    "120\r\n}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class jwtBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.tt
deleted file mode 100644
index 1795352..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwt.tt
+++ /dev/null
@@ -1,11 +0,0 @@
-<#@ template language="C#" #>
-{
-  //秘钥
-  "Key": "twAJ$j5##pVc5*y&",
-  //发行商
-  "Issuer": "http://www.17mkh.com",
-  //订阅者
-  "Audience": "http://www.17mkh.com",
-  //有效期(分钟)
-  "Expires": 120
-}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.Extend.cs
deleted file mode 100644
index 718889c..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.Extend.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    public partial class jwtDevelopment : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-
-        public jwtDevelopment(TemplateBuildModel model)
-        {
-            _model = model;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-            var filePath = Path.Combine(dir, "jwt.Development.json");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.cs
deleted file mode 100644
index 5ad57f9..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本: 16.0.0.0
-//  
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\jwtDevelopment.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class jwtDevelopment : jwtDevelopmentBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("{}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class jwtDevelopmentBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.tt
deleted file mode 100644
index 60f9b38..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/jwtDevelopment.tt
+++ /dev/null
@@ -1,2 +0,0 @@
-<#@ template language="C#" #>
-{}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.cs
index 98b326f..a6514b2 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.cs
@@ -15,7 +15,7 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\logging.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\logging.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class logging : loggingBase
     {
diff --git a/src/UI/module-codegenerator/src/components/config-codegenerator/index.vue b/src/UI/module-codegenerator/src/components/config-codegenerator/index.vue
new file mode 100644
index 0000000..fda8296
--- /dev/null
+++ b/src/UI/module-codegenerator/src/components/config-codegenerator/index.vue
@@ -0,0 +1,45 @@
+<template>
+  <nm-form-page v-bind="form">
+    <el-row :gutter="20">
+      <el-col :span="10" :offset="1">
+        <el-form-item label="模块前缀(后端命名空间)：" prop="prefix">
+          <el-input v-model="form.model.prefix" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="10">
+        <el-form-item label="前端组件前缀：" prop="uiPrefix">
+          <el-input v-model="form.model.uiPrefix" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="20" :offset="1">
+        <el-form-item label="生成代码存储路径：" prop="buildCodePath">
+          <el-input v-model="form.model.buildCodePath" placeholder="默认保存在通用临时路径下的CodeGenerator\BuildCode目录下" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </nm-form-page>
+</template>
+<script>
+import { mixins } from 'netmodular-module-admin'
+import module from '../../module'
+export default {
+  mixins: [mixins.configForm],
+  data() {
+    return {
+      code: module.code,
+      form: {
+        labelWidth: '200px',
+        model: {
+          prefix: '',
+          uiPrefix: '',
+          buildCodePath: ''
+        },
+        rules: {
+          prefix: [{ required: true, message: '模块前缀不能为空' }],
+          uiPrefix: [{ required: true, message: '前端组件前缀不能为空' }]
+        }
+      }
+    }
+  }
+}
+</script>
diff --git a/src/UI/module-codegenerator/src/components/index.js b/src/UI/module-codegenerator/src/components/index.js
index 9859f07..7aadcfe 100644
--- a/src/UI/module-codegenerator/src/components/index.js
+++ b/src/UI/module-codegenerator/src/components/index.js
@@ -1 +1,10 @@
-export default []
+import library from 'netmodular-ui/packages/library'
+let components = []
+const requireComponent = require.context('./', true, /index\.vue$/)
+requireComponent.keys().map(fileName => {
+  components.push({
+    name: `${library.prefix.toLowerCase()}-${fileName.split('/')[1]}`,
+    component: requireComponent(fileName).default
+  })
+})
+export default components
diff --git a/src/UI/module-codegenerator/src/views/module/index/index.vue b/src/UI/module-codegenerator/src/views/module/index/index.vue
index c7efd87..6326b41 100644
--- a/src/UI/module-codegenerator/src/views/module/index/index.vue
+++ b/src/UI/module-codegenerator/src/views/module/index/index.vue
@@ -92,7 +92,7 @@ export default {
   },
   methods: {
     buildCode(row) {
-      this._openLoading('正在努力生成代码，请稍后...')
+      this._openLoading('正在努力生成代码，首次生成需要调用官方NuGet接口查询最新包版本号，该过程较耗时，请您耐心等待...')
       api
         .buildCode({ id: row.id })
         .then(() => {
diff --git a/src/Web/Controllers/ClassController.cs b/src/Web/Controllers/ClassController.cs
index d24bcb6..7b5ea4f 100644
--- a/src/Web/Controllers/ClassController.cs
+++ b/src/Web/Controllers/ClassController.cs
@@ -6,8 +6,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using NetModular.Lib.Auth.Web.Attributes;
+using NetModular.Lib.Config.Abstractions;
+using NetModular.Lib.Config.Abstractions.Impl;
 using NetModular.Lib.Utils.Core.Extensions;
-using NetModular.Lib.Utils.Core.SystemConfig;
 using NetModular.Module.CodeGenerator.Application.ClassService;
 using NetModular.Module.CodeGenerator.Application.ClassService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Class;
@@ -20,15 +21,12 @@ namespace NetModular.Module.CodeGenerator.Web.Controllers
     [Common]
     public class ClassController : Web.ModuleController
     {
-        private readonly SystemConfigModel _systemConfig;
-        private readonly CodeGeneratorOptions _codeGeneratorOptions;
         private readonly IClassService _service;
-
-        public ClassController(SystemConfigModel systemConfig, CodeGeneratorOptions codeGeneratorOptions, IClassService service)
+        private readonly IConfigProvider _configProvider;
+        public ClassController(IClassService service, IConfigProvider configProvider)
         {
-            _systemConfig = systemConfig;
-            _codeGeneratorOptions = codeGeneratorOptions;
             _service = service;
+            _configProvider = configProvider;
         }
 
         [HttpGet]
@@ -79,8 +77,7 @@ public IResultModel BaseEntityTypeSelect()
         public async Task<IActionResult> BuildCode([BindRequired]Guid id)
         {
             var result = await _service.BuildCode(id);
-            var path = Path.Combine(_codeGeneratorOptions.BuildCodePath, result.Data.Id + ".zip");
-            return PhysicalFile(path, "application/octet-stream", HttpUtility.UrlEncode(result.Data.Name), true);
+            return PhysicalFile(result.Data.ZipPath, "application/octet-stream", HttpUtility.UrlEncode(result.Data.Name), true);
         }
     }
 }
diff --git a/src/Web/Controllers/ModuleController.cs b/src/Web/Controllers/ModuleController.cs
index c47544b..c92b584 100644
--- a/src/Web/Controllers/ModuleController.cs
+++ b/src/Web/Controllers/ModuleController.cs
@@ -5,7 +5,8 @@
 using System.Web;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using NetModular.Lib.Utils.Core.SystemConfig;
+using NetModular.Lib.Config.Abstractions;
+using NetModular.Lib.Config.Abstractions.Impl;
 using NetModular.Module.CodeGenerator.Application.ModuleService;
 using NetModular.Module.CodeGenerator.Application.ModuleService.ViewModels;
 using NetModular.Module.CodeGenerator.Domain.Module.Models;
@@ -16,15 +17,12 @@ namespace NetModular.Module.CodeGenerator.Web.Controllers
     [Description("模块管理")]
     public class ModuleController : Web.ModuleController
     {
-        private readonly SystemConfigModel _systemConfig;
-        private readonly CodeGeneratorOptions _codeGeneratorOptions;
         private readonly IModuleService _service;
-
-        public ModuleController(SystemConfigModel systemConfig, CodeGeneratorOptions codeGeneratorOptions, IModuleService service)
+        private readonly IConfigProvider _configProvider;
+        public ModuleController( IModuleService service, IConfigProvider configProvider)
         {
-            _systemConfig = systemConfig;
-            _codeGeneratorOptions = codeGeneratorOptions;
             _service = service;
+            _configProvider = configProvider;
         }
 
         [HttpGet]
@@ -67,8 +65,7 @@ public Task<IResultModel> Update(ModuleUpdateModel model)
         public async Task<IActionResult> BuildCode(ModuleBuildCodeModel model)
         {
             var result = await _service.BuildCode(model);
-            var path = Path.Combine(_codeGeneratorOptions.BuildCodePath, result.Data.Id + ".zip");
-            return PhysicalFile(path, "application/octet-stream", HttpUtility.UrlEncode(result.Data.Name), true);
+            return PhysicalFile(result.Data.ZipPath, "application/octet-stream", HttpUtility.UrlEncode(result.Data.Name), true);
         }
     }
 }
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index f2577a3..9acde56 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.4" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.4" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.5" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.4" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.6" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.6" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.7" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.6" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 71df494..2766c60 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.11" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.12" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.12" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.12" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.4" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.9" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.7" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.13" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.14" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.14" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.14" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.6" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.11" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.10" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
new file mode 100644
index 0000000..20b7472
--- /dev/null
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -0,0 +1 @@
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.5","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
diff --git a/src/WebHost/_modules/CodeGenerator/_module.json b/src/WebHost/_modules/CodeGenerator/_module.json
deleted file mode 100644
index f8de325..0000000
--- a/src/WebHost/_modules/CodeGenerator/_module.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Id": "CodeGenerator","Name":"代码生成","Icon":"develop","Version":"1.7.4"}
diff --git a/src/WebHost/config/cache.Development.json b/src/WebHost/config/cache.Development.json
deleted file mode 100644
index 22fdca1..0000000
--- a/src/WebHost/config/cache.Development.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/WebHost/config/cache.json b/src/WebHost/config/cache.json
deleted file mode 100644
index ab37fc7..0000000
--- a/src/WebHost/config/cache.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  // 0、MemoryCache 1、Redis
-  "Mode": 0,
-  "Redis": {
-    "ConnectionString": "127.0.0.1"
-  }
-}
\ No newline at end of file
diff --git a/src/WebHost/config/excel.Development.json b/src/WebHost/config/excel.Development.json
deleted file mode 100644
index 7a73a41..0000000
--- a/src/WebHost/config/excel.Development.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
\ No newline at end of file
diff --git a/src/WebHost/config/excel.json b/src/WebHost/config/excel.json
deleted file mode 100644
index c6f93d0..0000000
--- a/src/WebHost/config/excel.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  //Excel������ 0��EPPlus 1��NPOI 2��OpenXml
-  "Provider": 0,
-  //Excel�����ʱ�ļ�·�����ƣ�Ĭ��Excel����Ŀ¼�����ȫ�ֵ���ʱĿ¼��
-  "TempPath": ""
-}
\ No newline at end of file
diff --git a/src/WebHost/config/jwt.Development.json b/src/WebHost/config/jwt.Development.json
deleted file mode 100644
index 9e26dfe..0000000
--- a/src/WebHost/config/jwt.Development.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/WebHost/config/jwt.json b/src/WebHost/config/jwt.json
deleted file mode 100644
index c75cb8b..0000000
--- a/src/WebHost/config/jwt.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  //秘钥
-  "Key": "twAJ$j5##pVc5*y&",
-  //发行商
-  "Issuer": "http://www.iamoldli.com",
-  //订阅者
-  "Audience": "http://www.iamoldli.com",
-  //有效期(分钟)
-  "Expires": 120
-}
\ No newline at end of file
diff --git a/test/Infrastructure.Test/NugetHelperTest.cs b/test/Infrastructure.Test/NugetHelperTest.cs
index 79cb230..addb412 100644
--- a/test/Infrastructure.Test/NugetHelperTest.cs
+++ b/test/Infrastructure.Test/NugetHelperTest.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using NetModular;
-using NetModular.Lib.Utils.Core.SystemConfig;
 using NetModular.Module.CodeGenerator.Infrastructure;
 using NetModular.Module.CodeGenerator.Infrastructure.NuGet;
 using Xunit;
@@ -15,8 +14,7 @@ public NugetHelperTest()
         {
             var service = new ServiceCollection();
             service.AddHttpClient();
-            service.AddSingleton<SystemConfigModel>();
-            service.AddSingleton<CodeGeneratorOptions>();
+            service.AddSingleton<CodeGeneratorConfig>();
             service.AddSingleton<NuGetHelper>();
             _nuGetHelper = service.BuildServiceProvider().GetService<NuGetHelper>();
         }

From dfe612bcb30ae4d96fd77a602e9a5a20156e750c Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Sun, 19 Apr 2020 15:04:46 +0800
Subject: [PATCH 47/71] update

---
 src/UI/module-codegenerator/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/UI/module-codegenerator/package.json b/src/UI/module-codegenerator/package.json
index ef537c9..ca51bd8 100644
--- a/src/UI/module-codegenerator/package.json
+++ b/src/UI/module-codegenerator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netmodular-module-codegenerator",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "author": "Oldli",
   "code": "codeGenerator",
   "title": "代码生成",

From 5b56348c75bcf9fa97d2a2bcee5bd579fe0c71a9 Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Sun, 19 Apr 2020 17:20:08 +0800
Subject: [PATCH 48/71] update

---
 src/Directory.Build.props                      |  2 +-
 .../T4/src/UI/App/src/components/ConfigPage.cs | 18 +++++++++++++++---
 .../T4/src/UI/App/src/components/ConfigPage.tt | 18 +++++++++++++++---
 src/UI/module-codegenerator/package.json       |  4 ++--
 .../components/config-codegenerator/index.vue  | 16 ++++++++++++++--
 .../_modules/02_CodeGenerator/_module.json     |  2 +-
 6 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index e84f08d..47a1bc7 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.7.5</Version>
+		<Version>1.7.6</Version>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.cs
index 682bfee..5571843 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.cs
@@ -27,21 +27,33 @@ public virtual string TransformText()
         {
             this.Write(@"<template>
   <nm-form-page v-bind=""form"">
-    <!--�����Զ������-->
+    <!--�Զ������-->
   </nm-form-page>
 </template>
 <script>
-import { mixins } from 'netmodular-module-admin'
 import module from '../../module'
+const { edit, update } = $api.admin.config
 export default {
-  mixins: [mixins.configForm],
   data() {
     return {
       code: module.code,
+      type: 1,
       form: {
+        header: false,
+        action: this.update,
         model: {}
       }
     }
+  },
+  methods: {
+    update() {
+      return update({ type: this.type, code: this.code, json: JSON.stringify(this.form.model) })
+    }
+  },
+  created() {
+    edit({ type: this.type, code: this.code }).then(data => {
+      this.form.model = data
+    })
   }
 }
 </script>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.tt
index 355d6f3..031f27d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/components/ConfigPage.tt
@@ -1,21 +1,33 @@
 <#@ template language="C#" #>
 <template>
   <nm-form-page v-bind="form">
-    <!--这里自定义表单-->
+    <!--自定义表单-->
   </nm-form-page>
 </template>
 <script>
-import { mixins } from 'netmodular-module-admin'
 import module from '../../module'
+const { edit, update } = $api.admin.config
 export default {
-  mixins: [mixins.configForm],
   data() {
     return {
       code: module.code,
+      type: 1,
       form: {
+        header: false,
+        action: this.update,
         model: {}
       }
     }
+  },
+  methods: {
+    update() {
+      return update({ type: this.type, code: this.code, json: JSON.stringify(this.form.model) })
+    }
+  },
+  created() {
+    edit({ type: this.type, code: this.code }).then(data => {
+      this.form.model = data
+    })
   }
 }
 </script>
diff --git a/src/UI/module-codegenerator/package.json b/src/UI/module-codegenerator/package.json
index ca51bd8..a32de64 100644
--- a/src/UI/module-codegenerator/package.json
+++ b/src/UI/module-codegenerator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netmodular-module-codegenerator",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "author": "Oldli",
   "code": "codeGenerator",
   "title": "代码生成",
@@ -17,7 +17,7 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.2.9",
+    "netmodular-module-admin": "^1.3.5",
     "netmodular-ui": "^1.7.6"
   },
   "devDependencies": {
diff --git a/src/UI/module-codegenerator/src/components/config-codegenerator/index.vue b/src/UI/module-codegenerator/src/components/config-codegenerator/index.vue
index fda8296..484841c 100644
--- a/src/UI/module-codegenerator/src/components/config-codegenerator/index.vue
+++ b/src/UI/module-codegenerator/src/components/config-codegenerator/index.vue
@@ -20,14 +20,16 @@
   </nm-form-page>
 </template>
 <script>
-import { mixins } from 'netmodular-module-admin'
 import module from '../../module'
+const { edit, update } = $api.admin.config
 export default {
-  mixins: [mixins.configForm],
   data() {
     return {
       code: module.code,
+      type: 1,
       form: {
+        header: false,
+        action: this.update,
         labelWidth: '200px',
         model: {
           prefix: '',
@@ -40,6 +42,16 @@ export default {
         }
       }
     }
+  },
+  methods: {
+    update() {
+      return update({ type: this.type, code: this.code, json: JSON.stringify(this.form.model) })
+    }
+  },
+  created() {
+    edit({ type: this.type, code: this.code }).then(data => {
+      this.form.model = data
+    })
   }
 }
 </script>
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index 20b7472..a147fd7 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.5","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.6","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}

From 1a776c52c72a39ad83a5dde37cb421e88d3c3854 Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Mon, 20 Apr 2020 11:44:45 +0800
Subject: [PATCH 49/71] update

---
 src/Directory.Build.props                     |  2 +-
 .../Domain/Class/ClassEntity.Extend.cs        |  1 -
 .../Infrastructure/Infrastructure.csproj      |  3 +++
 .../Default/T4/src/WebHost/config/db.cs       | 24 +++++++++----------
 .../_modules/02_CodeGenerator/_module.json    |  2 +-
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 47a1bc7..987c769 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.7.6</Version>
+		<Version>1.7.7</Version>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Domain/Class/ClassEntity.Extend.cs b/src/Library/Domain/Class/ClassEntity.Extend.cs
index 2c25d52..e772eb9 100644
--- a/src/Library/Domain/Class/ClassEntity.Extend.cs
+++ b/src/Library/Domain/Class/ClassEntity.Extend.cs
@@ -1,5 +1,4 @@
 using NetModular.Lib.Data.Abstractions.Attributes;
-using NetModular.Lib.Utils.Core.Extensions;
 
 namespace NetModular.Module.CodeGenerator.Domain.Class
 {
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index b4e73dd..f5aa181 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -632,6 +632,9 @@
 	  <Compile Update="Templates\Default\T4\src\UI\App\src\components\ConfigPage.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
+	  <Compile Update="Templates\Default\T4\src\WebHost\config\db.cs">
+	    <DesignTime>True</DesignTime>
+	  </Compile>
 	  <Compile Update="Templates\Default\T4\src\WebHost\Properties\LaunchSettings.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
index 86cabc1..48f76d6 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
@@ -26,30 +26,30 @@ public partial class db : dbBase
         public virtual string TransformText()
         {
             this.Write(@"{
-  //????????
+  //�Ƿ�����־
   ""Logging"": false,
-  //????????? 0??SqlServer 1??MySql 2??SQLite
+  //���ݿ����� 0��SqlServer 1��MySql 2��SQLite
   ""Dialect"": 2,
-  //?????��
+  //���ݿ�汾
   ""Version"": """",
-  //???????
+  //���ݿ��ַ
   ""Server"": """",
-  //????
+  //�˿ں�
   ""Port"": 0,
-  //?????
+  //�û���
   ""UserId"": """",
-  //????
+  //����
   ""Password"": """",
-  //????????????
+  //�Ƿ񴴽����ݿ�ͱ�
   ""CreateDatabase"": true,
-  //???????????????????
+  //�Ƿ񴴽����ݿ���ʼ������
   ""InitData"": true,
-  //????��?
+  //ģ���б�
   ""Modules"": [
     {
-      //???????
+      //ģ������
       ""Name"": ""Admin"",
-      //?????????
+      //���ݿ�����
       ""Database"": """);
             
             #line 27 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index a147fd7..1836ecf 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.6","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.7","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}

From 8d2cb1bcd849f5e11e345f7bd4cd2cddf2c1c91e Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Mon, 20 Apr 2020 17:23:53 +0800
Subject: [PATCH 50/71] update

---
 src/WebHost/config/db.Development.json |  1 +
 src/WebHost/config/db.json             | 36 +++++++++++---------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/WebHost/config/db.Development.json b/src/WebHost/config/db.Development.json
index 63831f3..4bb3814 100644
--- a/src/WebHost/config/db.Development.json
+++ b/src/WebHost/config/db.Development.json
@@ -1,3 +1,4 @@
 {
+  //开启Swagger
   "Logging": true
 }
\ No newline at end of file
diff --git a/src/WebHost/config/db.json b/src/WebHost/config/db.json
index 9a4cdd7..b3c96b1 100644
--- a/src/WebHost/config/db.json
+++ b/src/WebHost/config/db.json
@@ -1,39 +1,33 @@
 {
-  //�Ƿ�����־
+  //是否开启日志
   "Logging": false,
-  //���ݿ����� 0��SqlServer 1��MySql 2��SQLite
+  //数据库类型 0、SqlServer 1、MySql 2、SQLite
   "Dialect": 2,
-  //���ݿ�汾
+  //数据库版本
   "Version": "",
-  //���ݿ��ַ
-  "Server": "..\\..\\data\\SQLite",
-  //�˿ں�
+  //数据库地址
+  "Server": "",
+  //端口号
   "Port": 0,
-  //�û���
+  //用户名
   "UserId": "",
-  //����
+  //密码
   "Password": "",
-  //�Ƿ񴴽����ݿ�ͱ�
+  //是否创建数据库和表
   "CreateDatabase": true,
-  //�Ƿ񴴽����ݿ���ʼ������
+  //是否创建数据库后初始化数据
   "InitData": true,
-  //ģ���б�
+  //模块列表
   "Modules": [
     {
-      //ģ������
+      //模块名称
       "Name": "Admin",
-      //��ǰ׺
-      "Prefix": "",
-      //���ݿ�����
-      "Database": "Nm_Admin",
-      //�Զ���������Ϣ
-      "ConnectionString": "",
-      //�Զ���汾��
-      "Version": ""
+      //数据库名称
+      "Database": "Nm_Admin"
     },
     {
       "Name": "CodeGenerator",
-      "Database": "Nm_CodeGenerator"
+      "Database": "CodeGenerator"
     }
   ]
 }
\ No newline at end of file

From c37833289c74de97fedcc6d4aaa1355e6b86e40c Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Tue, 21 Apr 2020 10:32:52 +0800
Subject: [PATCH 51/71] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/SQLite/Nm_Admin.db                       | Bin 159744 -> 159744 bytes
 src/Directory.Build.props                     |   2 +-
 src/Library/Application/Application.csproj    |   2 +-
 src/Library/Domain/Domain.csproj              |   4 +-
 .../Infrastructure/Infrastructure.csproj      |  85 ++---
 .../db.Extend.cs => AppSettings.Extend.cs}    |  10 +-
 .../WebHost/{config/db.cs => AppSettings.cs}  | 116 ++++---
 .../Default/T4/src/WebHost/AppSettings.tt     |  73 ++++
 ...nd.cs => AppSettingsDevelopment.Extend.cs} |  10 +-
 .../logging.cs => AppSettingsDevelopment.cs}  |  25 +-
 .../logging.tt => AppSettingsDevelopment.tt}  |  23 +-
 .../Default/T4/src/WebHost/Startup.cs         |  12 +-
 .../Default/T4/src/WebHost/Startup.tt         |   3 +-
 .../Default/T4/src/WebHost/config/db.tt       |  34 --
 .../WebHost/config/dbDevelopment.Extend.cs    |  28 --
 .../T4/src/WebHost/config/dbDevelopment.cs    | 307 -----------------
 .../T4/src/WebHost/config/dbDevelopment.tt    |   4 -
 .../T4/src/WebHost/config/host.Extend.cs      |  28 --
 .../Default/T4/src/WebHost/config/host.cs     | 314 ------------------
 .../Default/T4/src/WebHost/config/host.tt     |   7 -
 .../WebHost/config/hostDevelopment.Extend.cs  |  28 --
 .../T4/src/WebHost/config/hostDevelopment.cs  | 307 -----------------
 .../T4/src/WebHost/config/hostDevelopment.tt  |   5 -
 .../config/loggingDevelopment.Extend.cs       |  28 --
 .../src/WebHost/config/loggingDevelopment.cs  | 309 -----------------
 .../src/WebHost/config/loggingDevelopment.tt  |  12 -
 src/Web/Web.csproj                            |   2 +-
 src/WebHost/Startup.cs                        |   5 +-
 src/WebHost/WebHost.csproj                    |  13 +-
 .../_modules/02_CodeGenerator/_module.json    |   2 +-
 ...ging.json => appsettings.Development.json} |  25 +-
 src/WebHost/appsettings.json                  |  78 +++++
 src/WebHost/config/db.Development.json        |   4 -
 src/WebHost/config/db.json                    |  33 --
 src/WebHost/config/host.Development.json      |   4 -
 src/WebHost/config/host.json                  |   8 -
 src/WebHost/config/logging.Development.json   |  11 -
 .../Infrastructure.Test.csproj                |   2 +-
 38 files changed, 331 insertions(+), 1632 deletions(-)
 rename src/Library/Infrastructure/Templates/Default/T4/src/WebHost/{config/db.Extend.cs => AppSettings.Extend.cs} (77%)
 rename src/Library/Infrastructure/Templates/Default/T4/src/WebHost/{config/db.cs => AppSettings.cs} (82%)
 create mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.tt
 rename src/Library/Infrastructure/Templates/Default/T4/src/WebHost/{config/logging.Extend.cs => AppSettingsDevelopment.Extend.cs} (71%)
 rename src/Library/Infrastructure/Templates/Default/T4/src/WebHost/{config/logging.cs => AppSettingsDevelopment.cs} (96%)
 rename src/Library/Infrastructure/Templates/Default/T4/src/WebHost/{config/logging.tt => AppSettingsDevelopment.tt} (72%)
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.tt
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.tt
 rename src/WebHost/{config/logging.json => appsettings.Development.json} (71%)
 create mode 100644 src/WebHost/appsettings.json
 delete mode 100644 src/WebHost/config/db.Development.json
 delete mode 100644 src/WebHost/config/db.json
 delete mode 100644 src/WebHost/config/host.Development.json
 delete mode 100644 src/WebHost/config/host.json
 delete mode 100644 src/WebHost/config/logging.Development.json

diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index b7d5fec7632ecbcec514a9833e3aa2180b3c942f..6c80b09bcf1a34aeeb577ced9cf3e874ef176de3 100644
GIT binary patch
delta 403
zcmZp8z}fJCbAmKu*F+g-#;%PCzx)`znxp-<NBc9z2iT_>r&y$#rWpc}kx5#bg{5(-
zv87RBa+0yJk*TGjiIIVkfv$mxu91a;p@Ef=rIn$H9#G80%*-TiUR2fgpYs{H4+yYv
zgfQ?e=5^!Q&OMoP6GzBqK>-I2;ihOWA%;+SbyZ1KdDUt`XQn3M>4|!b`qR$`F*S-B
z8A44oGSD+MF}F0dv<MKLE~v_w#B6A2JY7+nQC7mj%F3`g&Qlm_inwI6Fsd=y)89HX
z-9VUSXs%~!WMF7!V#LsiYL+<2tR_Vdkc-4sMO9@D1>r`OAsJwzXKZS0Y-(xA@D9}g
zuwxo|+yxmzdBuTV64VqFbYx;+6rTRjf=Oli%JYo&(r`Z+8tNIE16^UlF#SKs-YB=}
P6M~qIZ0F5m`pgIbrIlnw

delta 129
zcmV-{0Dk{~;0b`>36L8Bg^?UX0fn((`c45xgIiCxTTcOBP(L|0VmLH7WHn-AG-EV5
zWjSFmGB{x}IAbwkWnnO3FlI6^GB7PLG%YeVATcmHG&njjIW9CdG&D0gHC~&$^SAk*
j0Smwg0u4q04x<f5vk?$F4FiH&MwgIM0>rlsZUXZGWH2Yy

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 987c769..4b69851 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.7.7</Version>
+		<Version>1.7.8</Version>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 4d3a6dd..1b6b978 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.14" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.15" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.5" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 80d610b..eb815dd 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.14" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.14" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.15" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.15" />
     <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.7" />
   </ItemGroup>
   
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index f5aa181..5747812 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -6,8 +6,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
-		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="1.9.0" />
-		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.10" />
+		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="1.9.1" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.12" />
 		<PackageReference Include="System.CodeDom" Version="4.7.0" />
 	</ItemGroup>
 
@@ -16,6 +16,14 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<None Update="Templates\Default\T4\src\WebHost\AppSettingsDevelopment.tt">
+			<Generator>TextTemplatingFilePreprocessor</Generator>
+			<LastGenOutput>AppSettingsDevelopment.cs</LastGenOutput>
+		</None>
+		<None Update="Templates\Default\T4\src\WebHost\AppSettings.tt">
+		  <Generator>TextTemplatingFilePreprocessor</Generator>
+		  <LastGenOutput>AppSettings.cs</LastGenOutput>
+		</None>
 		<None Update="Templates\Default\T4\src\WebHost\Properties\LaunchSettings.tt">
 			<Generator>TextTemplatingFilePreprocessor</Generator>
 			<LastGenOutput>LaunchSettings.cs</LastGenOutput>
@@ -236,30 +244,6 @@
 			<Generator>TextTemplatingFilePreprocessor</Generator>
 			<LastGenOutput>Startup.cs</LastGenOutput>
 		</None>
-		<None Update="Templates\Default\T4\src\WebHost\config\db.tt">
-			<Generator>TextTemplatingFilePreprocessor</Generator>
-			<LastGenOutput>db.cs</LastGenOutput>
-		</None>
-		<None Update="Templates\Default\T4\src\WebHost\config\dbDevelopment.tt">
-			<Generator>TextTemplatingFilePreprocessor</Generator>
-			<LastGenOutput>dbDevelopment.cs</LastGenOutput>
-		</None>
-		<None Update="Templates\Default\T4\src\WebHost\config\host.tt">
-			<Generator>TextTemplatingFilePreprocessor</Generator>
-			<LastGenOutput>host.cs</LastGenOutput>
-		</None>
-		<None Update="Templates\Default\T4\src\WebHost\config\hostDevelopment.tt">
-			<Generator>TextTemplatingFilePreprocessor</Generator>
-			<LastGenOutput>hostDevelopment.cs</LastGenOutput>
-		</None>
-		<None Update="Templates\Default\T4\src\WebHost\config\logging.tt">
-			<Generator>TextTemplatingFilePreprocessor</Generator>
-			<LastGenOutput>logging.cs</LastGenOutput>
-		</None>
-		<None Update="Templates\Default\T4\src\WebHost\config\loggingDevelopment.tt">
-			<Generator>TextTemplatingFilePreprocessor</Generator>
-			<LastGenOutput>loggingDevelopment.cs</LastGenOutput>
-		</None>
 		<None Update="Templates\Default\T4\src\DirectoryBuildProps.tt">
 			<Generator>TextTemplatingFilePreprocessor</Generator>
 			<LastGenOutput>DirectoryBuildProps.cs</LastGenOutput>
@@ -283,6 +267,16 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<Compile Update="Templates\Default\T4\src\WebHost\AppSettingsDevelopment.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>AppSettingsDevelopment.tt</DependentUpon>
+		</Compile>
+		<Compile Update="Templates\Default\T4\src\WebHost\AppSettings.*">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>AppSettings.tt</DependentUpon>
+		</Compile>
 		<Compile Update="Templates\Default\T4\src\WebHost\Properties\LaunchSettings.*">
 			<DesignTime>True</DesignTime>
 			<AutoGen>True</AutoGen>
@@ -463,36 +457,6 @@
 			<AutoGen>True</AutoGen>
 			<DependentUpon>appsettingsDevelopment.tt</DependentUpon>
 		</Compile>
-		<Compile Update="Templates\Default\T4\src\WebHost\config\db.*">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>db.tt</DependentUpon>
-		</Compile>
-		<Compile Update="Templates\Default\T4\src\WebHost\config\dbDevelopment.*">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>dbDevelopment.tt</DependentUpon>
-		</Compile>
-		<Compile Update="Templates\Default\T4\src\WebHost\config\host.*">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>host.tt</DependentUpon>
-		</Compile>
-		<Compile Update="Templates\Default\T4\src\WebHost\config\hostDevelopment.*">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>hostDevelopment.tt</DependentUpon>
-		</Compile>
-		<Compile Update="Templates\Default\T4\src\WebHost\config\logging.*">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>logging.tt</DependentUpon>
-		</Compile>
-		<Compile Update="Templates\Default\T4\src\WebHost\config\loggingDevelopment.*">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>loggingDevelopment.tt</DependentUpon>
-		</Compile>
 		<Compile Update="Templates\Default\T4\src\DirectoryBuildTargets.*">
 			<DesignTime>True</DesignTime>
 			<AutoGen>True</AutoGen>
@@ -626,16 +590,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Compile Update="Templates\Default\T4\Solution.cs">
-	    <DesignTime>True</DesignTime>
-	  </Compile>
-	  <Compile Update="Templates\Default\T4\src\UI\App\src\components\ConfigPage.cs">
+	  <Compile Update="Templates\Default\T4\src\WebHost\AppSettings.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
-	  <Compile Update="Templates\Default\T4\src\WebHost\config\db.cs">
+	  <Compile Update="Templates\Default\T4\src\WebHost\AppSettingsDevelopment.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
-	  <Compile Update="Templates\Default\T4\src\WebHost\Properties\LaunchSettings.cs">
+	  <Compile Update="Templates\Default\T4\src\WebHost\Startup.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
 	</ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.Extend.cs
similarity index 77%
rename from src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
rename to src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.Extend.cs
index e939d0c..208c21d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.Extend.cs
@@ -1,14 +1,14 @@
 using System.IO;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost
 {
-    public partial class db : ITemplateHandler
+    public partial class AppSettings : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
         private readonly string _dbPrefix;
 
-        public db(TemplateBuildModel model)
+        public AppSettings(TemplateBuildModel model)
         {
             _model = model;
             _dbPrefix = model.Module.UiPrefix;
@@ -18,12 +18,12 @@ public db(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
             var content = TransformText();
-            var filePath = Path.Combine(dir, "db.json");
+            var filePath = Path.Combine(dir, "appsettings.json");
             File.WriteAllText(filePath, content);
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.cs
similarity index 82%
rename from src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
rename to src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.cs
index 48f76d6..266373e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.cs
@@ -7,7 +7,7 @@
 //     �������ɴ��룬��Щ���Ľ��ᶪʧ��
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost
 {
     using System;
     
@@ -15,9 +15,9 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\AppSettings.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class db : dbBase
+    public partial class AppSettings : AppSettingsBase
     {
 #line hidden
         /// <summary>
@@ -25,60 +25,102 @@ public partial class db : dbBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write(@"{
-  //�Ƿ�����־
-  ""Logging"": false,
-  //���ݿ����� 0��SqlServer 1��MySql 2��SQLite
-  ""Dialect"": 2,
-  //���ݿ�汾
-  ""Version"": """",
-  //���ݿ��ַ
-  ""Server"": """",
-  //�˿ں�
-  ""Port"": 0,
-  //�û���
-  ""UserId"": """",
-  //����
-  ""Password"": """",
-  //�Ƿ񴴽����ݿ�ͱ�
-  ""CreateDatabase"": true,
-  //�Ƿ񴴽����ݿ���ʼ������
-  ""InitData"": true,
-  //ģ���б�
-  ""Modules"": [
-    {
-      //ģ������
-      ""Name"": ""Admin"",
-      //���ݿ�����
-      ""Database"": """);
+            this.Write("{\r\n  \"Host\": {\r\n    //��ַ\r\n    \"Urls\": \"http://*:");
+            
+            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\AppSettings.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.No + 6220));
+            
+            #line default
+            #line hidden
+            this.Write(@""",
+    //����Swagger
+    ""Swagger"": false,
+    //����
+    ""Proxy"": false,
+    //ָ���������ʱԤ���������Ч�ڣ���λ�룬Ĭ��30����
+    ""PreflightMaxAge"": 0
+  },
+  ""Serilog"": {
+    ""MinimumLevel"": {
+      ""Default"": ""Error"",
+      ""Override"": {
+        ""Microsoft"": ""Error"",
+        ""System"": ""Error""
+      }
+    },
+    ""WriteTo"": [
+      //������ļ�
+      {
+        ""Name"": ""File"",
+        ""Args"": {
+          //�ļ�·��
+          ""path"": ""log/log.log"",
+          //�ļ�������ʽ
+          ""rollingInterval"": ""Day"",
+          //��Ϣ�����ʽ
+          ""outputTemplate"": ""{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}"",
+          //�ļ�����
+          ""retainedFileCountLimit"": 60,
+          //ʹ�û��壬���д��Ч��
+          ""buffered"": false
+        }
+      }
+    ]
+  },
+  ""Db"": {
+    //�Ƿ�����־
+    ""Logging"": false,
+    //���ݿ����� 0��SqlServer 1��MySql 2��SQLite
+    ""Dialect"": 2,
+    //���ݿ�汾
+    ""Version"": """",
+    //���ݿ��ַ
+    ""Server"": """",
+    //�˿ں�
+    ""Port"": 0,
+    //�û���
+    ""UserId"": """",
+    //����
+    ""Password"": """",
+    //�Ƿ񴴽����ݿ�ͱ�
+    ""CreateDatabase"": true,
+    //�Ƿ��ʼ������
+    ""InitData"": true,
+    //ģ���б�
+    ""Modules"":  [
+      {
+        //ģ������
+        ""Name"": ""Admin"",
+        //���ݿ�����
+        ""Database"": """);
             
-            #line 27 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
+            #line 65 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\AppSettings.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_dbPrefix));
             
             #line default
             #line hidden
-            this.Write("_Admin\"\r\n    },\r\n    {\r\n      \"Name\": \"");
+            this.Write("_Admin\"\r\n      },\r\n      {\r\n        \"Name\": \"");
             
-            #line 30 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
+            #line 68 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\AppSettings.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
-            this.Write("\",\r\n      \"Database\": \"");
+            this.Write("\",\r\n        \"Database\": \"");
             
-            #line 31 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
+            #line 69 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\AppSettings.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_dbPrefix));
             
             #line default
             #line hidden
             this.Write("_");
             
-            #line 31 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\db.tt"
+            #line 69 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\AppSettings.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
-            this.Write("\"\r\n    }\r\n  ]\r\n}");
+            this.Write("\"\r\n      }\r\n    ]\r\n  }\r\n}\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
@@ -90,7 +132,7 @@ public virtual string TransformText()
     /// Base class for this transformation
     /// </summary>
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class dbBase
+    public class AppSettingsBase
     {
         #region Fields
         private global::System.Text.StringBuilder generationEnvironmentField;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.tt
new file mode 100644
index 0000000..cd02b71
--- /dev/null
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.tt
@@ -0,0 +1,73 @@
+<#@ template language="C#" #>
+{
+  "Host": {
+    //��ַ
+    "Urls": "http://*:<#= _model.Module.No + 6220 #>",
+    //����Swagger
+    "Swagger": false,
+    //����
+    "Proxy": false,
+    //ָ���������ʱԤ���������Ч�ڣ���λ�룬Ĭ��30����
+    "PreflightMaxAge": 0
+  },
+  "Serilog": {
+    "MinimumLevel": {
+      "Default": "Error",
+      "Override": {
+        "Microsoft": "Error",
+        "System": "Error"
+      }
+    },
+    "WriteTo": [
+      //������ļ�
+      {
+        "Name": "File",
+        "Args": {
+          //�ļ�·��
+          "path": "log/log.log",
+          //�ļ�������ʽ
+          "rollingInterval": "Day",
+          //��Ϣ�����ʽ
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}",
+          //�ļ�����
+          "retainedFileCountLimit": 60,
+          //ʹ�û��壬���д��Ч��
+          "buffered": false
+        }
+      }
+    ]
+  },
+  "Db": {
+    //�Ƿ�����־
+    "Logging": false,
+    //���ݿ����� 0��SqlServer 1��MySql 2��SQLite
+    "Dialect": 2,
+    //���ݿ�汾
+    "Version": "",
+    //���ݿ��ַ
+    "Server": "",
+    //�˿ں�
+    "Port": 0,
+    //�û���
+    "UserId": "",
+    //����
+    "Password": "",
+    //�Ƿ񴴽����ݿ�ͱ�
+    "CreateDatabase": true,
+    //�Ƿ��ʼ������
+    "InitData": true,
+    //ģ���б�
+    "Modules":  [
+      {
+        //ģ������
+        "Name": "Admin",
+        //���ݿ�����
+        "Database": "<#= _dbPrefix #>_Admin"
+      },
+      {
+        "Name": "<#= _model.Module.Code #>",
+        "Database": "<#= _dbPrefix #>_<#= _model.Module.Code #>"
+      }
+    ]
+  }
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.Extend.cs
similarity index 71%
rename from src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.Extend.cs
rename to src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.Extend.cs
index c8af83c..55cd0c8 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.Extend.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.Extend.cs
@@ -1,13 +1,13 @@
 using System.IO;
 using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
 
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost
 {
-    public partial class logging : ITemplateHandler
+    public partial class AppSettingsDevelopment : ITemplateHandler
     {
         private readonly TemplateBuildModel _model;
 
-        public logging(TemplateBuildModel model)
+        public AppSettingsDevelopment(TemplateBuildModel model)
         {
             _model = model;
         }
@@ -16,12 +16,12 @@ public logging(TemplateBuildModel model)
 
         public void Save()
         {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
+            var dir = Path.Combine(_model.RootPath, "src/WebHost");
             if (!Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
             var content = TransformText();
-            var filePath = Path.Combine(dir, "logging.json");
+            var filePath = Path.Combine(dir, "appsettings.Development.json");
             File.WriteAllText(filePath, content);
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.cs
similarity index 96%
rename from src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.cs
rename to src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.cs
index a6514b2..92aa35b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.cs
@@ -7,7 +7,7 @@
 //     �������ɴ��룬��Щ���Ľ��ᶪʧ��
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
+namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost
 {
     using System;
     
@@ -15,9 +15,9 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\logging.tt"
+    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\AppSettingsDevelopment.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class logging : loggingBase
+    public partial class AppSettingsDevelopment : AppSettingsDevelopmentBase
     {
 #line hidden
         /// <summary>
@@ -25,16 +25,18 @@ public partial class logging : loggingBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write(@"{
+            this.Write(@"
+{
   ""Serilog"": {
     ""MinimumLevel"": {
-      ""Default"": ""Error"",
+      ""Default"": ""Debug"",
       ""Override"": {
-        ""Microsoft"": ""Error"",
-        ""System"": ""Error""
+        ""Microsoft"": ""Debug"",
+        ""System"": ""Debug""
       }
     },
     ""WriteTo"": [
+      //���뵽����̨
       {
         ""Name"": ""Console"",
         ""Args"": {
@@ -42,6 +44,7 @@ public virtual string TransformText()
           ""outputTemplate"": ""[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}""
         }
       },
+      //������ļ�
       {
         ""Name"": ""File"",
         ""Args"": {
@@ -58,8 +61,12 @@ public virtual string TransformText()
         }
       }
     ]
+  },
+  ""Db"": {
+    ""Logging"": true
   }
-}");
+}
+");
             return this.GenerationEnvironment.ToString();
         }
     }
@@ -71,7 +78,7 @@ public virtual string TransformText()
     /// Base class for this transformation
     /// </summary>
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class loggingBase
+    public class AppSettingsDevelopmentBase
     {
         #region Fields
         private global::System.Text.StringBuilder generationEnvironmentField;
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.tt
similarity index 72%
rename from src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.tt
rename to src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.tt
index 9942aee..52244c5 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/logging.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.tt
@@ -2,13 +2,14 @@
 {
   "Serilog": {
     "MinimumLevel": {
-      "Default": "Error",
+      "Default": "Debug",
       "Override": {
-        "Microsoft": "Error",
-        "System": "Error"
+        "Microsoft": "Debug",
+        "System": "Debug"
       }
     },
     "WriteTo": [
+      //���뵽����̨
       {
         "Name": "Console",
         "Args": {
@@ -16,21 +17,25 @@
           "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}"
         }
       },
+      //������ļ�
       {
         "Name": "File",
         "Args": {
-          //文件路径
+          //�ļ�·��
           "path": "log/log.log",
-          //文件滚动方式
+          //�ļ�������ʽ
           "rollingInterval": "Day",
-          //消息输出格式
+          //��Ϣ�����ʽ
           "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}",
-          //文件数量
+          //�ļ�����
           "retainedFileCountLimit": 60,
-          //使用缓冲，提高写入效率
+          //ʹ�û��壬���д��Ч��
           "buffered": false
         }
       }
     ]
+  },
+  "Db": {
+    "Logging": true
   }
-}
\ No newline at end of file
+}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs
index 3eb96d4..e924a5c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs
@@ -25,29 +25,31 @@ public partial class Startup : StartupBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("using Microsoft.Extensions.Hosting;\r\nusing ");
+            this.Write("using Microsoft.Extensions.Configuration;\r\nusing Microsoft.Extensions.Hosting;\r\nu" +
+                    "sing ");
             
-            #line 3 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Host.Web;\r\n\r\nnamespace ");
             
-            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write(".WebHost\r\n{\r\n    public class Startup : StartupAbstract\r\n    {\r\n        public St" +
-                    "artup(IHostEnvironment env) : base(env)\r\n        {\r\n        }\r\n    }\r\n}\r\n");
+                    "artup(IHostEnvironment env, IConfiguration cfg) : base(env, cfg)\r\n        {\r\n   " +
+                    "     }\r\n    }\r\n}\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.tt
index ce997bb..7142694 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.tt
@@ -1,4 +1,5 @@
 <#@ template language="C#" #>
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using <#= _prefix #>.Lib.Host.Web;
 
@@ -6,7 +7,7 @@ namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.WebHost
 {
     public class Startup : StartupAbstract
     {
-        public Startup(IHostEnvironment env) : base(env)
+        public Startup(IHostEnvironment env, IConfiguration cfg) : base(env, cfg)
         {
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.tt
deleted file mode 100644
index 725c74d..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/db.tt
+++ /dev/null
@@ -1,34 +0,0 @@
-<#@ template language="C#" #>
-{
-  //�Ƿ�����־
-  "Logging": false,
-  //���ݿ����� 0��SqlServer 1��MySql 2��SQLite
-  "Dialect": 2,
-  //���ݿ�汾
-  "Version": "",
-  //���ݿ��ַ
-  "Server": "",
-  //�˿ں�
-  "Port": 0,
-  //�û���
-  "UserId": "",
-  //����
-  "Password": "",
-  //�Ƿ񴴽����ݿ�ͱ�
-  "CreateDatabase": true,
-  //�Ƿ񴴽����ݿ���ʼ������
-  "InitData": true,
-  //ģ���б�
-  "Modules": [
-    {
-      //ģ������
-      "Name": "Admin",
-      //���ݿ�����
-      "Database": "<#= _dbPrefix #>_Admin"
-    },
-    {
-      "Name": "<#= _model.Module.Code #>",
-      "Database": "<#= _dbPrefix #>_<#= _model.Module.Code #>"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.Extend.cs
deleted file mode 100644
index 814984d..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.Extend.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    public partial class dbDevelopment : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-
-        public dbDevelopment(TemplateBuildModel model)
-        {
-            _model = model;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-            var filePath = Path.Combine(dir, "db.Development.json");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.cs
deleted file mode 100644
index b7e3865..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     �˴����ɹ������ɡ�
-//     ����ʱ�汾: 16.0.0.0
-//  
-//     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
-//     �������ɴ��룬��Щ���Ľ��ᶪʧ��
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\dbDevelopment.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class dbDevelopment : dbDevelopmentBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("{\r\n    \"Logging\": true\r\n}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class dbDevelopmentBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.tt
deleted file mode 100644
index 0a6d28c..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/dbDevelopment.tt
+++ /dev/null
@@ -1,4 +0,0 @@
-<#@ template language="C#" #>
-{
-    "Logging": true
-}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.Extend.cs
deleted file mode 100644
index 8c48813..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.Extend.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    public partial class host : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-
-        public host(TemplateBuildModel model)
-        {
-            _model = model;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-            var filePath = Path.Combine(dir, "host.json");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.cs
deleted file mode 100644
index 3005c53..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本: 16.0.0.0
-//  
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\host.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class host : hostBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("{\r\n    //地址\r\n    \"Urls\": \"http://*:");
-            
-            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\host.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.No + 6220));
-            
-            #line default
-            #line hidden
-            this.Write("\",\r\n    //开启Swagger\r\n    \"Swagger\": false\r\n}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class hostBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.tt
deleted file mode 100644
index cd39218..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/host.tt
+++ /dev/null
@@ -1,7 +0,0 @@
-<#@ template language="C#" #>
-{
-    //地址
-    "Urls": "http://*:<#= _model.Module.No + 6220 #>",
-    //开启Swagger
-    "Swagger": false
-}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.Extend.cs
deleted file mode 100644
index bf21948..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.Extend.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    public partial class hostDevelopment : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-
-        public hostDevelopment(TemplateBuildModel model)
-        {
-            _model = model;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-            var filePath = Path.Combine(dir, "host.Development.json");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.cs
deleted file mode 100644
index 80ae20e..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本: 16.0.0.0
-//  
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\hostDevelopment.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class hostDevelopment : hostDevelopmentBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("{\r\n  //开启Swagger\r\n  \"Swagger\": true\r\n}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class hostDevelopmentBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.tt
deleted file mode 100644
index 64e97ab..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/hostDevelopment.tt
+++ /dev/null
@@ -1,5 +0,0 @@
-<#@ template language="C#" #>
-{
-  //开启Swagger
-  "Swagger": true
-}
\ No newline at end of file
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.Extend.cs
deleted file mode 100644
index be8188d..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.Extend.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    public partial class loggingDevelopment : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-
-        public loggingDevelopment(TemplateBuildModel model)
-        {
-            _model = model;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost/config");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-            var filePath = Path.Combine(dir, "logging.Development.json");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.cs
deleted file mode 100644
index 174d009..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     �˴����ɹ������ɡ�
-//     ����ʱ�汾: 16.0.0.0
-//  
-//     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
-//     �������ɴ��룬��Щ���Ľ��ᶪʧ��
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost.config
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\config\loggingDevelopment.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class loggingDevelopment : loggingDevelopmentBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("{\r\n  \"Serilog\": {\r\n    \"MinimumLevel\": {\r\n      \"Default\": \"Debug\",\r\n      \"Overr" +
-                    "ide\": {\r\n        \"Microsoft\": \"Debug\",\r\n        \"System\": \"Debug\"\r\n      }\r\n    " +
-                    "}\r\n  }\r\n}");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class loggingDevelopmentBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.tt
deleted file mode 100644
index 496e46a..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/config/loggingDevelopment.tt
+++ /dev/null
@@ -1,12 +0,0 @@
-<#@ template language="C#" #>
-{
-  "Serilog": {
-    "MinimumLevel": {
-      "Default": "Debug",
-      "Override": {
-        "Microsoft": "Debug",
-        "System": "Debug"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 9acde56..3656236 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.6" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.7" />
     <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.6" />
     <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.7" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.6" />
diff --git a/src/WebHost/Startup.cs b/src/WebHost/Startup.cs
index 19c2923..ea039f1 100644
--- a/src/WebHost/Startup.cs
+++ b/src/WebHost/Startup.cs
@@ -1,11 +1,12 @@
-using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using NetModular.Lib.Host.Web;
 
 namespace NetModular.Module.CodeGenerator.WebHost
 {
     public class Startup : StartupAbstract
     {
-        public Startup(IHostEnvironment env) : base(env)
+        public Startup(IHostEnvironment env, IConfiguration cfg) : base(env, cfg)
         {
         }
     }
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 2766c60..9648137 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -10,12 +10,12 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.13" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.14" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.14" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.14" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.15" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.15" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.15" />
     <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.6" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.11" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.10" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.13" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.12" />
   </ItemGroup>
 
   <ItemGroup>
@@ -26,9 +26,6 @@
 
   <ItemGroup>
     <!--复制配置文件到输出目录-->
-    <None Update="config\**\*.*">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <!--复制模块相关文件到输出路径中-->
     <None Update="_modules\**\*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index 1836ecf..caf3a4b 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.7","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.8","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
diff --git a/src/WebHost/config/logging.json b/src/WebHost/appsettings.Development.json
similarity index 71%
rename from src/WebHost/config/logging.json
rename to src/WebHost/appsettings.Development.json
index 5d01240..e4ddb13 100644
--- a/src/WebHost/config/logging.json
+++ b/src/WebHost/appsettings.Development.json
@@ -1,14 +1,14 @@
 {
   "Serilog": {
     "MinimumLevel": {
-      "Default": "Error",
+      "Default": "Debug",
       "Override": {
-        "Microsoft": "Error",
-        "System": "Error"
+        "Microsoft": "Debug",
+        "System": "Debug"
       }
     },
     "WriteTo": [
-      //输入到控制台
+      //���뵽����̨
       {
         "Name": "Console",
         "Args": {
@@ -16,22 +16,25 @@
           "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}"
         }
       },
-      //输出到文件
+      //������ļ�
       {
         "Name": "File",
         "Args": {
-          //文件路径
+          //�ļ�·��
           "path": "log/log.log",
-          //文件滚动方式
+          //�ļ�������ʽ
           "rollingInterval": "Day",
-          //消息输出格式
+          //��Ϣ�����ʽ
           "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}",
-          //文件数量
+          //�ļ�����
           "retainedFileCountLimit": 60,
-          //使用缓冲，提高写入效率
+          //ʹ�û��壬���д��Ч��
           "buffered": false
         }
       }
     ]
+  },
+  "Db": {
+    "Logging": true
   }
-}
\ No newline at end of file
+}
diff --git a/src/WebHost/appsettings.json b/src/WebHost/appsettings.json
new file mode 100644
index 0000000..26a7d12
--- /dev/null
+++ b/src/WebHost/appsettings.json
@@ -0,0 +1,78 @@
+{
+  "Host": {
+    //��ַ
+    "Urls": "http://*:6222",
+    //����Swagger
+    "Swagger": false,
+    //����
+    "Proxy": false,
+    //ָ���������ʱԤ���������Ч�ڣ���λ�룬Ĭ��30����
+    "PreflightMaxAge": 0
+  },
+  "Serilog": {
+    "MinimumLevel": {
+      "Default": "Error",
+      "Override": {
+        "Microsoft": "Error",
+        "System": "Error"
+      }
+    },
+    "WriteTo": [
+      //������ļ�
+      {
+        "Name": "File",
+        "Args": {
+          //�ļ�·��
+          "path": "log/log.log",
+          //�ļ�������ʽ
+          "rollingInterval": "Day",
+          //��Ϣ�����ʽ
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}",
+          //�ļ�����
+          "retainedFileCountLimit": 60,
+          //ʹ�û��壬���д��Ч��
+          "buffered": false
+        }
+      }
+    ]
+  },
+  "Db": {
+    //�Ƿ�����־
+    "Logging": false,
+    //���ݿ����� 0��SqlServer 1��MySql 2��SQLite
+    "Dialect": 2,
+    //���ݿ�汾
+    "Version": "",
+    //���ݿ��ַ
+    "Server": "../../data/SQLite",
+    //�˿ں�
+    "Port": 0,
+    //�û���
+    "UserId": "",
+    //����
+    "Password": "",
+    //�Ƿ񴴽����ݿ�ͱ�
+    "CreateDatabase": true,
+    //�Ƿ��ʼ������
+    "InitData": true,
+    //ģ���б�
+    "Modules": [
+      {
+        //ģ������
+        "Name": "Admin",
+        //��ǰ׺
+        "Prefix": "",
+        //���ݿ�����
+        "Database": "Nm_Admin",
+        //�Զ���������Ϣ
+        "ConnectionString": "",
+        //�Զ���汾��
+        "Version": ""
+      },
+      {
+        "Name": "CodeGenerator",
+        "Database": "Nm_CodeGenerator"
+      }
+    ]
+  }
+}
diff --git a/src/WebHost/config/db.Development.json b/src/WebHost/config/db.Development.json
deleted file mode 100644
index 4bb3814..0000000
--- a/src/WebHost/config/db.Development.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  //开启Swagger
-  "Logging": true
-}
\ No newline at end of file
diff --git a/src/WebHost/config/db.json b/src/WebHost/config/db.json
deleted file mode 100644
index b3c96b1..0000000
--- a/src/WebHost/config/db.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  //是否开启日志
-  "Logging": false,
-  //数据库类型 0、SqlServer 1、MySql 2、SQLite
-  "Dialect": 2,
-  //数据库版本
-  "Version": "",
-  //数据库地址
-  "Server": "",
-  //端口号
-  "Port": 0,
-  //用户名
-  "UserId": "",
-  //密码
-  "Password": "",
-  //是否创建数据库和表
-  "CreateDatabase": true,
-  //是否创建数据库后初始化数据
-  "InitData": true,
-  //模块列表
-  "Modules": [
-    {
-      //模块名称
-      "Name": "Admin",
-      //数据库名称
-      "Database": "Nm_Admin"
-    },
-    {
-      "Name": "CodeGenerator",
-      "Database": "CodeGenerator"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/WebHost/config/host.Development.json b/src/WebHost/config/host.Development.json
deleted file mode 100644
index becaf07..0000000
--- a/src/WebHost/config/host.Development.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  //开启Swagger
-  "Swagger": true
-}
\ No newline at end of file
diff --git a/src/WebHost/config/host.json b/src/WebHost/config/host.json
deleted file mode 100644
index 7c88ed2..0000000
--- a/src/WebHost/config/host.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  //地址
-  "Urls": "http://*:6222",
-  //开启Swagger
-  "Swagger": false,
-  //代理
-  "Proxy": false
-}
\ No newline at end of file
diff --git a/src/WebHost/config/logging.Development.json b/src/WebHost/config/logging.Development.json
deleted file mode 100644
index e68296b..0000000
--- a/src/WebHost/config/logging.Development.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "Serilog": {
-    "MinimumLevel": {
-      "Default": "Debug",
-      "Override": {
-        "Microsoft": "Debug",
-        "System": "Debug"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/test/Infrastructure.Test/Infrastructure.Test.csproj b/test/Infrastructure.Test/Infrastructure.Test.csproj
index 8d1e7d6..7ac8acf 100644
--- a/test/Infrastructure.Test/Infrastructure.Test.csproj
+++ b/test/Infrastructure.Test/Infrastructure.Test.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

From 5d17ba0a6c07dd011db99945732587018df31c23 Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Wed, 22 Apr 2020 09:29:33 +0800
Subject: [PATCH 52/71] update

---
 src/UI/module-codegenerator/package.json                      | 2 +-
 .../src/components/config-codegenerator/index.vue             | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/UI/module-codegenerator/package.json b/src/UI/module-codegenerator/package.json
index a32de64..bd618b9 100644
--- a/src/UI/module-codegenerator/package.json
+++ b/src/UI/module-codegenerator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netmodular-module-codegenerator",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Oldli",
   "code": "codeGenerator",
   "title": "代码生成",
diff --git a/src/UI/module-codegenerator/src/components/config-codegenerator/index.vue b/src/UI/module-codegenerator/src/components/config-codegenerator/index.vue
index 484841c..5b6aeef 100644
--- a/src/UI/module-codegenerator/src/components/config-codegenerator/index.vue
+++ b/src/UI/module-codegenerator/src/components/config-codegenerator/index.vue
@@ -1,6 +1,6 @@
 <template>
   <nm-form-page v-bind="form">
-    <el-row :gutter="20">
+    <el-row>
       <el-col :span="10" :offset="1">
         <el-form-item label="模块前缀(后端命名空间)：" prop="prefix">
           <el-input v-model="form.model.prefix" />
@@ -11,6 +11,8 @@
           <el-input v-model="form.model.uiPrefix" />
         </el-form-item>
       </el-col>
+    </el-row>
+    <el-row>
       <el-col :span="20" :offset="1">
         <el-form-item label="生成代码存储路径：" prop="buildCodePath">
           <el-input v-model="form.model.buildCodePath" placeholder="默认保存在通用临时路径下的CodeGenerator\BuildCode目录下" />

From b55be9ba12accdf33b843f4b3ce6ef01855cacdc Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Tue, 28 Apr 2020 08:47:22 +0800
Subject: [PATCH 53/71] update

---
 src/Library/Application/Application.csproj          |  2 +-
 src/Library/Domain/Domain.csproj                    |  6 +++---
 src/Library/Infrastructure/Infrastructure.csproj    |  4 ++--
 src/UI/module-codegenerator/package.json            |  6 +++---
 src/Web/Web.csproj                                  |  4 ++--
 src/WebHost/WebHost.csproj                          | 12 ++++++------
 test/Infrastructure.Test/Infrastructure.Test.csproj |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 1b6b978..12e30a8 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.15" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.16" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.5" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index eb815dd..5e16a67 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.15" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.15" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.7" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.16" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.16" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.9" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 5747812..96ca909 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -6,8 +6,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
-		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="1.9.1" />
-		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.12" />
+		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="1.9.2" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.15" />
 		<PackageReference Include="System.CodeDom" Version="4.7.0" />
 	</ItemGroup>
 
diff --git a/src/UI/module-codegenerator/package.json b/src/UI/module-codegenerator/package.json
index bd618b9..e90512e 100644
--- a/src/UI/module-codegenerator/package.json
+++ b/src/UI/module-codegenerator/package.json
@@ -17,8 +17,8 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.3.5",
-    "netmodular-ui": "^1.7.6"
+    "netmodular-module-admin": "^1.3.9",
+    "netmodular-ui": "^1.7.8"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.2.3",
@@ -33,7 +33,7 @@
     "eslint-plugin-vue": "^5.0.0",
     "prettier": "^1.18.2",
     "rimraf": "^3.0.2",
-    "sass": "^1.26.3",
+    "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.11"
   }
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 3656236..8c68cf2 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.7" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.9" />
     <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.6" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.7" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.9" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.6" />
   </ItemGroup>
   
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 9648137..ce038d6 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -10,12 +10,12 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.13" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.15" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.15" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.15" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.6" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.13" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.12" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.16" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.16" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.16" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.7" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.15" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.15" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Infrastructure.Test/Infrastructure.Test.csproj b/test/Infrastructure.Test/Infrastructure.Test.csproj
index 7ac8acf..ecb231e 100644
--- a/test/Infrastructure.Test/Infrastructure.Test.csproj
+++ b/test/Infrastructure.Test/Infrastructure.Test.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

From c4a91a62013a9c0357141aef5a4cdfde2f5af147 Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Tue, 5 May 2020 18:40:33 +0800
Subject: [PATCH 54/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/SQLite/Nm_Admin.db                       | Bin 159744 -> 192512 bytes
 script/npm_install.ps1                        |   3 --
 script/npm_publish.ps1                        |   3 --
 script/npm_update.ps1                         |   3 --
 src/Directory.Build.props                     |   2 +-
 src/Library/Application/Application.csproj    |   2 +-
 src/Library/Domain/Domain.csproj              |   6 +--
 .../Infrastructure/Infrastructure.csproj      |  11 ++++-
 .../NuGet/NuGetPackageVersions.cs             |   2 +
 .../ModuleServicesConfigurator.cs             |  24 ++++++----
 .../ModuleServicesConfigurator.tt             |   5 ++-
 .../Default/T4/src/Web/ModuleInitializer.cs   |  18 +++-----
 .../Default/T4/src/Web/ModuleInitializer.tt   |   7 +--
 .../Default/T4/src/WebHost/AppSettings.cs     |  42 +++++++++++++++++-
 .../Default/T4/src/WebHost/AppSettings.tt     |  35 +++++++++++++++
 .../Default/T4/src/WebHost/Csproj.cs          |  16 ++++++-
 .../Default/T4/src/WebHost/Csproj.tt          |   1 +
 src/UI/module-codegenerator/package.json      |   4 +-
 src/Web/ModuleInitializer.cs                  |   6 +--
 src/Web/Web.csproj                            |   4 +-
 src/WebHost/WebHost.csproj                    |  15 ++++---
 .../_modules/02_CodeGenerator/_module.json    |   2 +-
 22 files changed, 151 insertions(+), 60 deletions(-)
 delete mode 100644 script/npm_install.ps1
 delete mode 100644 script/npm_publish.ps1
 delete mode 100644 script/npm_update.ps1

diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index 6c80b09bcf1a34aeeb577ced9cf3e874ef176de3..9fbf952f1e6fff0cbf91ebde199c31fb9ec8ae35 100644
GIT binary patch
delta 20940
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

delta 11419
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
BoJRlv

diff --git a/script/npm_install.ps1 b/script/npm_install.ps1
deleted file mode 100644
index 11393c2..0000000
--- a/script/npm_install.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-cd ../src/UI/module-code-generator
-npm --registry  https://registry.npmjs.org/ install
-pause
\ No newline at end of file
diff --git a/script/npm_publish.ps1 b/script/npm_publish.ps1
deleted file mode 100644
index 74ab354..0000000
--- a/script/npm_publish.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-cd ../src/UI/module-code-generator
-npm --registry  https://registry.npmjs.org/ publish
-pause
\ No newline at end of file
diff --git a/script/npm_update.ps1 b/script/npm_update.ps1
deleted file mode 100644
index 699166f..0000000
--- a/script/npm_update.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-cd ../src/UI/module-code-generator
-npm --registry  https://registry.npmjs.org/ update
-pause
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 4b69851..13e2bf7 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.7.8</Version>
+		<Version>1.7.9</Version>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 12e30a8..d181e9e 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.16" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.19" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.5" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 5e16a67..9b5e226 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.16" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.16" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.9" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.19" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.19" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.14" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 96ca909..3a7444d 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -7,7 +7,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
 		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="1.9.2" />
-		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.15" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.22" />
 		<PackageReference Include="System.CodeDom" Version="4.7.0" />
 	</ItemGroup>
 
@@ -590,15 +590,24 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Compile Update="Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.cs">
+	    <DesignTime>True</DesignTime>
+	  </Compile>
 	  <Compile Update="Templates\Default\T4\src\WebHost\AppSettings.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
 	  <Compile Update="Templates\Default\T4\src\WebHost\AppSettingsDevelopment.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
+	  <Compile Update="Templates\Default\T4\src\WebHost\Csproj.cs">
+	    <DesignTime>True</DesignTime>
+	  </Compile>
 	  <Compile Update="Templates\Default\T4\src\WebHost\Startup.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
+	  <Compile Update="Templates\Default\T4\src\Web\ModuleInitializer.cs">
+	    <DesignTime>True</DesignTime>
+	  </Compile>
 	</ItemGroup>
 
 </Project>
diff --git a/src/Library/Infrastructure/NuGet/NuGetPackageVersions.cs b/src/Library/Infrastructure/NuGet/NuGetPackageVersions.cs
index caf4b23..d0df9c8 100644
--- a/src/Library/Infrastructure/NuGet/NuGetPackageVersions.cs
+++ b/src/Library/Infrastructure/NuGet/NuGetPackageVersions.cs
@@ -40,5 +40,7 @@ public class NuGetPackageVersions
         public string Module_Admin_Domain { get; set; }
 
         public string Module_Admin_Web { get; set; }
+
+        public string Lib_OSS_Local { get; set; }
     }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.cs
index 8c4c73c..d467adf 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.cs
@@ -25,32 +25,38 @@ public partial class ModuleServicesConfigurator : ModuleServicesConfiguratorBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("using Microsoft.Extensions.DependencyInjection;\r\nusing Microsoft.Extensions.Hosti" +
-                    "ng;\r\nusing ");
+            this.Write("using Microsoft.Extensions.Configuration;\r\nusing Microsoft.Extensions.DependencyI" +
+                    "njection;\r\nusing Microsoft.Extensions.Hosting;\r\nusing ");
             
-            #line 3 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt"
+            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Module.Abstractions;\r\n\r\nnamespace ");
             
-            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt"
+            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
-            this.Write(".Infrastructure\r\n{\r\n    public class ModuleServicesConfigurator : IModuleServices" +
-                    "Configurator\r\n    {\r\n        public void Configure(IServiceCollection services, " +
-                    "IModuleCollection modules, IHostEnvironment env)\r\n        {\r\n        }\r\n    }\r\n}" +
-                    "\r\n");
+            this.Write(@".Infrastructure
+{
+    public class ModuleServicesConfigurator : IModuleServicesConfigurator
+    {
+        public void Configure(IServiceCollection services, IModuleCollection modules, IHostEnvironment env, IConfiguration cfg)
+        {
+        }
+    }
+}
+");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.tt
index 6d71b12..16f6a20 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/ModuleServicesConfigurator.tt
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using <#= _prefix #>.Lib.Module.Abstractions;
 
@@ -6,7 +7,7 @@ namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Infrastructure
 {
     public class ModuleServicesConfigurator : IModuleServicesConfigurator
     {
-        public void Configure(IServiceCollection services, IModuleCollection modules, IHostEnvironment env)
+        public void Configure(IServiceCollection services, IModuleCollection modules, IHostEnvironment env, IConfiguration cfg)
         {
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
index 172eb40..c5f11db 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.cs
@@ -26,31 +26,31 @@ public partial class ModuleInitializer : ModuleInitializerBase
         public virtual string TransformText()
         {
             this.Write("using Microsoft.AspNetCore.Builder;\r\nusing Microsoft.AspNetCore.Mvc;\r\nusing Micro" +
-                    "soft.Extensions.DependencyInjection;\r\nusing Microsoft.Extensions.Hosting;\r\nusing" +
-                    " ");
+                    "soft.Extensions.Configuration;\r\nusing Microsoft.Extensions.DependencyInjection;\r" +
+                    "\nusing Microsoft.Extensions.Hosting;\r\nusing ");
             
-            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Module.Abstractions;\r\nusing ");
             
-            #line 7 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Module.AspNetCore;\r\n\r\nnamespace ");
             
-            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
+            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\ModuleInitializer.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
@@ -62,16 +62,13 @@ public class ModuleInitializer : IModuleInitializer
         /// <summary>
         /// 注入服务
         /// </summary>
-        /// <param name=""services""></param>
-        public void ConfigureServices(IServiceCollection services, IModuleCollection modules, IHostEnvironment env)
+        public void ConfigureServices(IServiceCollection services, IModuleCollection modules, IHostEnvironment env, IConfiguration cfg)
         {
         }
 
         /// <summary>
         /// 配置中间件
         /// </summary>
-        /// <param name=""app""></param>
-        /// <param name=""env""></param>
         public void Configure(IApplicationBuilder app, IHostEnvironment env)
         {
         }
@@ -79,7 +76,6 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env)
         /// <summary>
         /// 配置MVC功能
         /// </summary>
-        /// <param name=""mvcOptions""></param>
         public void ConfigureMvc(MvcOptions mvcOptions)
         {
         }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
index d9a5194..e31c990 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/ModuleInitializer.tt
@@ -1,6 +1,7 @@
 <#@ template language="C#" #>
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using <#= _prefix #>.Lib.Module.Abstractions;
@@ -13,16 +14,13 @@ namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Web
         /// <summary>
         /// 注入服务
         /// </summary>
-        /// <param name="services"></param>
-        public void ConfigureServices(IServiceCollection services, IModuleCollection modules, IHostEnvironment env)
+        public void ConfigureServices(IServiceCollection services, IModuleCollection modules, IHostEnvironment env, IConfiguration cfg)
         {
         }
 
         /// <summary>
         /// 配置中间件
         /// </summary>
-        /// <param name="app"></param>
-        /// <param name="env"></param>
         public void Configure(IApplicationBuilder app, IHostEnvironment env)
         {
         }
@@ -30,7 +28,6 @@ namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.Web
         /// <summary>
         /// 配置MVC功能
         /// </summary>
-        /// <param name="mvcOptions"></param>
         public void ConfigureMvc(MvcOptions mvcOptions)
         {
         }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.cs
index 266373e..8bff742 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.cs
@@ -120,7 +120,47 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("\"\r\n      }\r\n    ]\r\n  }\r\n}\r\n");
+            this.Write(@"""
+      }
+    ]
+  },
+  //��������
+  ""Cache"": {
+    //�����ṩ����0��MemoryCache 1��Redis
+    ""Provider"": 0,
+    //Redis����
+    ""Redis"": {
+      ""Prefix"": """",
+      ""ConnectionString"": ""127.0.0.1""
+    }
+  },
+  //Excel����
+  ""Excel"": {
+    //Excel��⣺0��EPPlus 1��NPOI 2��OpenXml (��ʱֻʵ����EPPlus)
+    ""Provider"": 0,
+    //Excel����ʱ��������ʱ�ļ��洢��·��
+    ""TempPath"": """"
+  },
+  //OSS����
+  ""OSS"": {
+    //�洢�ṩ����0�����ش洢 1����ţ
+    ""Provider"": 0,
+    //��ţ�洢����
+    ""Qiniu"": {
+      //Key
+      ""AccessKey"": """",
+      //��Կ
+      ""SecretKey"": """",
+      //����(�������/)
+      ""Domain"": """",
+      //�ռ�����
+      ""Bucket"": """",
+      //�洢����0���� �� 1���� �� 2���� �� 3���� �� 4��������
+      ""Zone"": 0
+    }
+  }
+}
+");
             return this.GenerationEnvironment.ToString();
         }
     }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.tt
index cd02b71..2210766 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.tt
@@ -69,5 +69,40 @@
         "Database": "<#= _dbPrefix #>_<#= _model.Module.Code #>"
       }
     ]
+  },
+  //��������
+  "Cache": {
+    //�����ṩ����0��MemoryCache 1��Redis
+    "Provider": 0,
+    //Redis����
+    "Redis": {
+      "Prefix": "",
+      "ConnectionString": "127.0.0.1"
+    }
+  },
+  //Excel����
+  "Excel": {
+    //Excel��⣺0��EPPlus 1��NPOI 2��OpenXml (��ʱֻʵ����EPPlus)
+    "Provider": 0,
+    //Excel����ʱ��������ʱ�ļ��洢��·��
+    "TempPath": ""
+  },
+  //OSS����
+  "OSS": {
+    //�洢�ṩ����0�����ش洢 1����ţ
+    "Provider": 0,
+    //��ţ�洢����
+    "Qiniu": {
+      //Key
+      "AccessKey": "",
+      //��Կ
+      "SecretKey": "",
+      //����(�������/)
+      "Domain": "",
+      //�ռ�����
+      "Bucket": "",
+      //�洢����0���� �� 1���� �� 2���� �� 3���� �� 4��������
+      "Zone": 0
+    }
   }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
index 7470931..4ed6c0d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
@@ -127,9 +127,23 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write(".Module.Admin.Web\" Version=\"");
+            this.Write(".Lib.OSS.Local\" Version=\"");
             
             #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_OSS_Local));
+            
+            #line default
+            #line hidden
+            this.Write("\" />\r\n    <PackageReference Include=\"");
+            
+            #line 20 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
+            
+            #line default
+            #line hidden
+            this.Write(".Module.Admin.Web\" Version=\"");
+            
+            #line 20 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Module_Admin_Web));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
index dd206fa..9f3ba6a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
@@ -16,6 +16,7 @@
     <PackageReference Include="<#= _prefix #>.Lib.Data.SqlServer" Version="<#= _versions.Lib_Data_SqlServer #>" />
     <PackageReference Include="<#= _prefix #>.Lib.Excel.EPPlus" Version="<#= _versions.Lib_Excel_EPPlus #>" />
     <PackageReference Include="<#= _prefix #>.Lib.Host.Web" Version="<#= _versions.Lib_Host_Web #>" />
+    <PackageReference Include="<#= _prefix #>.Lib.OSS.Local" Version="<#= _versions.Lib_OSS_Local #>" />
     <PackageReference Include="<#= _prefix #>.Module.Admin.Web" Version="<#= _versions.Module_Admin_Web #>" />
   </ItemGroup>
 
diff --git a/src/UI/module-codegenerator/package.json b/src/UI/module-codegenerator/package.json
index e90512e..6fae7c6 100644
--- a/src/UI/module-codegenerator/package.json
+++ b/src/UI/module-codegenerator/package.json
@@ -17,8 +17,8 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.3.9",
-    "netmodular-ui": "^1.7.8"
+    "netmodular-module-admin": "^1.4.6",
+    "netmodular-ui": "^1.7.13"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.2.3",
diff --git a/src/Web/ModuleInitializer.cs b/src/Web/ModuleInitializer.cs
index efd3cba..9f9b98b 100644
--- a/src/Web/ModuleInitializer.cs
+++ b/src/Web/ModuleInitializer.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using NetModular.Lib.Module.Abstractions;
@@ -12,10 +13,7 @@ public class ModuleInitializer : IModuleInitializer
         /// <summary>
         /// 注入服务
         /// </summary>
-        /// <param name="services"></param>
-        /// <param name="modules"></param>
-        /// <param name="env"></param>
-        public void ConfigureServices(IServiceCollection services, IModuleCollection modules, IHostEnvironment env)
+        public void ConfigureServices(IServiceCollection services, IModuleCollection modules, IHostEnvironment env, IConfiguration cfg)
         {
         }
 
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 8c68cf2..469b02d 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -7,8 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.9" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.6" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.9" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.7" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.14" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.6" />
   </ItemGroup>
   
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index ce038d6..ea417e1 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -9,13 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.13" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.16" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.16" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.16" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.7" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.15" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.15" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.14" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.19" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.19" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.19" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.8" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.21" />
+    <PackageReference Include="NetModular.Lib.OSS.Local" Version="1.9.4" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.22" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index caf3a4b..8a95e02 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.8","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.9","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}

From d1057bbd77fbf851046752d26df76ea9f3e27553 Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Tue, 5 May 2020 20:00:43 +0800
Subject: [PATCH 55/71] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B9=B1=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                     |  2 +-
 .../Default/T4/src/WebHost/AppSettings.cs     | 80 +++++++++----------
 .../Default/T4/src/WebHost/AppSettings.tt     | 72 ++++++++---------
 .../T4/src/WebHost/AppSettingsDevelopment.cs  | 24 +++---
 .../T4/src/WebHost/AppSettingsDevelopment.tt  | 16 ++--
 .../_modules/02_CodeGenerator/_module.json    |  2 +-
 src/WebHost/appsettings.Development.json      | 16 ++--
 src/WebHost/appsettings.json                  | 52 ++++++------
 8 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 13e2bf7..fc04ee8 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.7.9</Version>
+		<Version>1.7.10</Version>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.cs
index 8bff742..01f2fc6 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.cs
@@ -1,10 +1,10 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
-//     �˴����ɹ������ɡ�
-//     ����ʱ�汾: 16.0.0.0
+//     此代码由工具生成。
+//     运行时版本: 16.0.0.0
 //  
-//     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
-//     �������ɴ��룬��Щ���Ľ��ᶪʧ��
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，这些更改将会丢失。
 // </auto-generated>
 // ------------------------------------------------------------------------------
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost
@@ -25,7 +25,7 @@ public partial class AppSettings : AppSettingsBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("{\r\n  \"Host\": {\r\n    //��ַ\r\n    \"Urls\": \"http://*:");
+            this.Write("{\r\n  \"Host\": {\r\n    //地址\r\n    \"Urls\": \"http://*:");
             
             #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\AppSettings.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.No + 6220));
@@ -33,11 +33,11 @@ public virtual string TransformText()
             #line default
             #line hidden
             this.Write(@""",
-    //����Swagger
+    //开启Swagger
     ""Swagger"": false,
-    //����
+    //代理
     ""Proxy"": false,
-    //ָ���������ʱԤ���������Ч�ڣ���λ�룬Ĭ��30����
+    //指定跨域访问时预检请求的有效期，单位秒，默认30分钟
     ""PreflightMaxAge"": 0
   },
   ""Serilog"": {
@@ -49,49 +49,49 @@ public virtual string TransformText()
       }
     },
     ""WriteTo"": [
-      //������ļ�
+      //输出到文件
       {
         ""Name"": ""File"",
         ""Args"": {
-          //�ļ�·��
+          //文件路径
           ""path"": ""log/log.log"",
-          //�ļ�������ʽ
+          //文件滚动方式
           ""rollingInterval"": ""Day"",
-          //��Ϣ�����ʽ
+          //消息输出格式
           ""outputTemplate"": ""{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}"",
-          //�ļ�����
+          //文件数量
           ""retainedFileCountLimit"": 60,
-          //ʹ�û��壬���д��Ч��
+          //使用缓冲，提高写入效率
           ""buffered"": false
         }
       }
     ]
   },
   ""Db"": {
-    //�Ƿ�����־
+    //是否开启日志
     ""Logging"": false,
-    //���ݿ����� 0��SqlServer 1��MySql 2��SQLite
+    //数据库类型 0、SqlServer 1、MySql 2、SQLite
     ""Dialect"": 2,
-    //���ݿ�汾
+    //数据库版本
     ""Version"": """",
-    //���ݿ��ַ
+    //数据库地址
     ""Server"": """",
-    //�˿ں�
+    //端口号
     ""Port"": 0,
-    //�û���
+    //用户名
     ""UserId"": """",
-    //����
+    //密码
     ""Password"": """",
-    //�Ƿ񴴽����ݿ�ͱ�
+    //是否创建数据库和表
     ""CreateDatabase"": true,
-    //�Ƿ��ʼ������
+    //是否初始化数据
     ""InitData"": true,
-    //ģ���б�
+    //模块列表
     ""Modules"":  [
       {
-        //ģ������
+        //模块名称
         ""Name"": ""Admin"",
-        //���ݿ�����
+        //数据库名称
         ""Database"": """);
             
             #line 65 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\AppSettings.tt"
@@ -124,38 +124,38 @@ public virtual string TransformText()
       }
     ]
   },
-  //��������
+  //缓存配置
   ""Cache"": {
-    //�����ṩ����0��MemoryCache 1��Redis
+    //缓存提供器：0、MemoryCache 1、Redis
     ""Provider"": 0,
-    //Redis����
+    //Redis配置
     ""Redis"": {
       ""Prefix"": """",
       ""ConnectionString"": ""127.0.0.1""
     }
   },
-  //Excel����
+  //Excel配置
   ""Excel"": {
-    //Excel��⣺0��EPPlus 1��NPOI 2��OpenXml (��ʱֻʵ����EPPlus)
+    //Excel类库：0、EPPlus 1、NPOI 2、OpenXml (暂时只实现了EPPlus)
     ""Provider"": 0,
-    //Excel����ʱ��������ʱ�ļ��洢��·��
+    //Excel操作时产生的临时文件存储根路径
     ""TempPath"": """"
   },
-  //OSS����
+  //OSS配置
   ""OSS"": {
-    //�洢�ṩ����0�����ش洢 1����ţ
+    //存储提供器：0、本地存储 1、七牛
     ""Provider"": 0,
-    //��ţ�洢����
+    //七牛存储配置
     ""Qiniu"": {
       //Key
       ""AccessKey"": """",
-      //��Կ
+      //密钥
       ""SecretKey"": """",
-      //����(�������/)
+      //域名(结尾不包含/)
       ""Domain"": """",
-      //�ռ�����
+      //空间名称
       ""Bucket"": """",
-      //�洢����0���� �� 1���� �� 2���� �� 3���� �� 4��������
+      //存储区域：0、华 东 1、华 北 2、华 南 3、北 美 4、东南亚
       ""Zone"": 0
     }
   }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.tt
index 2210766..e6de56e 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettings.tt
@@ -1,13 +1,13 @@
-<#@ template language="C#" #>
+<#@ template language="C#" #>
 {
   "Host": {
-    //��ַ
+    //地址
     "Urls": "http://*:<#= _model.Module.No + 6220 #>",
-    //����Swagger
+    //开启Swagger
     "Swagger": false,
-    //����
+    //代理
     "Proxy": false,
-    //ָ���������ʱԤ���������Ч�ڣ���λ�룬Ĭ��30����
+    //指定跨域访问时预检请求的有效期，单位秒，默认30分钟
     "PreflightMaxAge": 0
   },
   "Serilog": {
@@ -19,49 +19,49 @@
       }
     },
     "WriteTo": [
-      //������ļ�
+      //输出到文件
       {
         "Name": "File",
         "Args": {
-          //�ļ�·��
+          //文件路径
           "path": "log/log.log",
-          //�ļ�������ʽ
+          //文件滚动方式
           "rollingInterval": "Day",
-          //��Ϣ�����ʽ
+          //消息输出格式
           "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}",
-          //�ļ�����
+          //文件数量
           "retainedFileCountLimit": 60,
-          //ʹ�û��壬���д��Ч��
+          //使用缓冲，提高写入效率
           "buffered": false
         }
       }
     ]
   },
   "Db": {
-    //�Ƿ�����־
+    //是否开启日志
     "Logging": false,
-    //���ݿ����� 0��SqlServer 1��MySql 2��SQLite
+    //数据库类型 0、SqlServer 1、MySql 2、SQLite
     "Dialect": 2,
-    //���ݿ�汾
+    //数据库版本
     "Version": "",
-    //���ݿ��ַ
+    //数据库地址
     "Server": "",
-    //�˿ں�
+    //端口号
     "Port": 0,
-    //�û���
+    //用户名
     "UserId": "",
-    //����
+    //密码
     "Password": "",
-    //�Ƿ񴴽����ݿ�ͱ�
+    //是否创建数据库和表
     "CreateDatabase": true,
-    //�Ƿ��ʼ������
+    //是否初始化数据
     "InitData": true,
-    //ģ���б�
+    //模块列表
     "Modules":  [
       {
-        //ģ������
+        //模块名称
         "Name": "Admin",
-        //���ݿ�����
+        //数据库名称
         "Database": "<#= _dbPrefix #>_Admin"
       },
       {
@@ -70,38 +70,38 @@
       }
     ]
   },
-  //��������
+  //缓存配置
   "Cache": {
-    //�����ṩ����0��MemoryCache 1��Redis
+    //缓存提供器：0、MemoryCache 1、Redis
     "Provider": 0,
-    //Redis����
+    //Redis配置
     "Redis": {
       "Prefix": "",
       "ConnectionString": "127.0.0.1"
     }
   },
-  //Excel����
+  //Excel配置
   "Excel": {
-    //Excel��⣺0��EPPlus 1��NPOI 2��OpenXml (��ʱֻʵ����EPPlus)
+    //Excel类库：0、EPPlus 1、NPOI 2、OpenXml (暂时只实现了EPPlus)
     "Provider": 0,
-    //Excel����ʱ��������ʱ�ļ��洢��·��
+    //Excel操作时产生的临时文件存储根路径
     "TempPath": ""
   },
-  //OSS����
+  //OSS配置
   "OSS": {
-    //�洢�ṩ����0�����ش洢 1����ţ
+    //存储提供器：0、本地存储 1、七牛
     "Provider": 0,
-    //��ţ�洢����
+    //七牛存储配置
     "Qiniu": {
       //Key
       "AccessKey": "",
-      //��Կ
+      //密钥
       "SecretKey": "",
-      //����(�������/)
+      //域名(结尾不包含/)
       "Domain": "",
-      //�ռ�����
+      //空间名称
       "Bucket": "",
-      //�洢����0���� �� 1���� �� 2���� �� 3���� �� 4��������
+      //存储区域：0、华 东 1、华 北 2、华 南 3、北 美 4、东南亚
       "Zone": 0
     }
   }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.cs
index 92aa35b..2fe7300 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.cs
@@ -1,10 +1,10 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
 // <auto-generated>
-//     �˴����ɹ������ɡ�
-//     ����ʱ�汾: 16.0.0.0
+//     此代码由工具生成。
+//     运行时版本: 16.0.0.0
 //  
-//     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
-//     �������ɴ��룬��Щ���Ľ��ᶪʧ��
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，这些更改将会丢失。
 // </auto-generated>
 // ------------------------------------------------------------------------------
 namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost
@@ -36,7 +36,7 @@ public virtual string TransformText()
       }
     },
     ""WriteTo"": [
-      //���뵽����̨
+      //输入到控制台
       {
         ""Name"": ""Console"",
         ""Args"": {
@@ -44,19 +44,19 @@ public virtual string TransformText()
           ""outputTemplate"": ""[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}""
         }
       },
-      //������ļ�
+      //输出到文件
       {
         ""Name"": ""File"",
         ""Args"": {
-          //�ļ�·��
+          //文件路径
           ""path"": ""log/log.log"",
-          //�ļ�������ʽ
+          //文件滚动方式
           ""rollingInterval"": ""Day"",
-          //��Ϣ�����ʽ
+          //消息输出格式
           ""outputTemplate"": ""{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}"",
-          //�ļ�����
+          //文件数量
           ""retainedFileCountLimit"": 60,
-          //ʹ�û��壬���д��Ч��
+          //使用缓冲，提高写入效率
           ""buffered"": false
         }
       }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.tt
index 52244c5..3de4a76 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/AppSettingsDevelopment.tt
@@ -1,4 +1,4 @@
-<#@ template language="C#" #>
+<#@ template language="C#" #>
 {
   "Serilog": {
     "MinimumLevel": {
@@ -9,7 +9,7 @@
       }
     },
     "WriteTo": [
-      //���뵽����̨
+      //输入到控制台
       {
         "Name": "Console",
         "Args": {
@@ -17,19 +17,19 @@
           "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}"
         }
       },
-      //������ļ�
+      //输出到文件
       {
         "Name": "File",
         "Args": {
-          //�ļ�·��
+          //文件路径
           "path": "log/log.log",
-          //�ļ�������ʽ
+          //文件滚动方式
           "rollingInterval": "Day",
-          //��Ϣ�����ʽ
+          //消息输出格式
           "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}",
-          //�ļ�����
+          //文件数量
           "retainedFileCountLimit": 60,
-          //ʹ�û��壬���д��Ч��
+          //使用缓冲，提高写入效率
           "buffered": false
         }
       }
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index 8a95e02..62defbd 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.9","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.10","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
diff --git a/src/WebHost/appsettings.Development.json b/src/WebHost/appsettings.Development.json
index e4ddb13..0d6f4c7 100644
--- a/src/WebHost/appsettings.Development.json
+++ b/src/WebHost/appsettings.Development.json
@@ -1,4 +1,4 @@
-{
+{
   "Serilog": {
     "MinimumLevel": {
       "Default": "Debug",
@@ -8,7 +8,7 @@
       }
     },
     "WriteTo": [
-      //���뵽����̨
+      //输入到控制台
       {
         "Name": "Console",
         "Args": {
@@ -16,19 +16,19 @@
           "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}"
         }
       },
-      //������ļ�
+      //输出到文件
       {
         "Name": "File",
         "Args": {
-          //�ļ�·��
+          //文件路径
           "path": "log/log.log",
-          //�ļ�������ʽ
+          //文件滚动方式
           "rollingInterval": "Day",
-          //��Ϣ�����ʽ
+          //消息输出格式
           "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}",
-          //�ļ�����
+          //文件数量
           "retainedFileCountLimit": 60,
-          //ʹ�û��壬���д��Ч��
+          //使用缓冲，提高写入效率
           "buffered": false
         }
       }
diff --git a/src/WebHost/appsettings.json b/src/WebHost/appsettings.json
index 26a7d12..b72fdc8 100644
--- a/src/WebHost/appsettings.json
+++ b/src/WebHost/appsettings.json
@@ -1,12 +1,12 @@
-{
+{
   "Host": {
-    //��ַ
+    //地址
     "Urls": "http://*:6222",
-    //����Swagger
+    //开启Swagger
     "Swagger": false,
-    //����
+    //代理
     "Proxy": false,
-    //ָ���������ʱԤ���������Ч�ڣ���λ�룬Ĭ��30����
+    //指定跨域访问时预检请求的有效期，单位秒，默认30分钟
     "PreflightMaxAge": 0
   },
   "Serilog": {
@@ -18,55 +18,55 @@
       }
     },
     "WriteTo": [
-      //������ļ�
+      //输出到文件
       {
         "Name": "File",
         "Args": {
-          //�ļ�·��
+          //文件路径
           "path": "log/log.log",
-          //�ļ�������ʽ
+          //文件滚动方式
           "rollingInterval": "Day",
-          //��Ϣ�����ʽ
+          //消息输出格式
           "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}",
-          //�ļ�����
+          //文件数量
           "retainedFileCountLimit": 60,
-          //ʹ�û��壬���д��Ч��
+          //使用缓冲，提高写入效率
           "buffered": false
         }
       }
     ]
   },
   "Db": {
-    //�Ƿ�����־
+    //是否开启日志
     "Logging": false,
-    //���ݿ����� 0��SqlServer 1��MySql 2��SQLite
+    //数据库类型 0、SqlServer 1、MySql 2、SQLite
     "Dialect": 2,
-    //���ݿ�汾
+    //数据库版本
     "Version": "",
-    //���ݿ��ַ
+    //数据库地址
     "Server": "../../data/SQLite",
-    //�˿ں�
+    //端口号
     "Port": 0,
-    //�û���
+    //用户名
     "UserId": "",
-    //����
+    //密码
     "Password": "",
-    //�Ƿ񴴽����ݿ�ͱ�
+    //是否创建数据库和表
     "CreateDatabase": true,
-    //�Ƿ��ʼ������
+    //是否初始化数据
     "InitData": true,
-    //ģ���б�
+    //模块列表
     "Modules": [
       {
-        //ģ������
+        //模块名称
         "Name": "Admin",
-        //��ǰ׺
+        //表前缀
         "Prefix": "",
-        //���ݿ�����
+        //数据库名称
         "Database": "Nm_Admin",
-        //�Զ���������Ϣ
+        //自定义连接信息
         "ConnectionString": "",
-        //�Զ���汾��
+        //自定义版本号
         "Version": ""
       },
       {

From 1819d59a90549fff0d158188b11881c4180f3430 Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Fri, 15 May 2020 21:26:48 +0800
Subject: [PATCH 56/71] =?UTF-8?q?=E6=B7=BB=E5=8A=A0PostgreSQL=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                             |  2 +-
 src/Library/Application/Application.csproj            |  2 +-
 src/Library/Domain/Domain.csproj                      |  4 ++--
 src/Library/Infrastructure/Infrastructure.csproj      |  4 ++--
 .../Repositories/PostgreSQL/ClassMethodRepository.cs  | 11 +++++++++++
 .../Repositories/PostgreSQL/ClassRepository.cs        | 11 +++++++++++
 .../Repositories/PostgreSQL/EnumItemRepository.cs     | 11 +++++++++++
 .../Repositories/PostgreSQL/EnumRepository.cs         | 11 +++++++++++
 .../PostgreSQL/ModelPropertyRepository.cs             | 11 +++++++++++
 .../Repositories/PostgreSQL/ModuleRepository.cs       | 11 +++++++++++
 .../Repositories/PostgreSQL/OnlineModuleRepository.cs |  2 +-
 .../Repositories/PostgreSQL/PropertyRepository.cs     | 11 +++++++++++
 src/WebHost/WebHost.csproj                            | 10 +++++-----
 13 files changed, 89 insertions(+), 12 deletions(-)
 create mode 100644 src/Library/Infrastructure/Repositories/PostgreSQL/ClassMethodRepository.cs
 create mode 100644 src/Library/Infrastructure/Repositories/PostgreSQL/ClassRepository.cs
 create mode 100644 src/Library/Infrastructure/Repositories/PostgreSQL/EnumItemRepository.cs
 create mode 100644 src/Library/Infrastructure/Repositories/PostgreSQL/EnumRepository.cs
 create mode 100644 src/Library/Infrastructure/Repositories/PostgreSQL/ModelPropertyRepository.cs
 create mode 100644 src/Library/Infrastructure/Repositories/PostgreSQL/ModuleRepository.cs
 create mode 100644 src/Library/Infrastructure/Repositories/PostgreSQL/PropertyRepository.cs

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index fc04ee8..e2db2fb 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.7.10</Version>
+		<Version>1.7.11</Version>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index d181e9e..d09f880 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.19" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.23" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.5" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 9b5e226..1d200df 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.19" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.19" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.23" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.23" />
     <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.14" />
   </ItemGroup>
   
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 3a7444d..a730f08 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -5,9 +5,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.4" />
 		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="1.9.2" />
-		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.22" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.23" />
 		<PackageReference Include="System.CodeDom" Version="4.7.0" />
 	</ItemGroup>
 
diff --git a/src/Library/Infrastructure/Repositories/PostgreSQL/ClassMethodRepository.cs b/src/Library/Infrastructure/Repositories/PostgreSQL/ClassMethodRepository.cs
new file mode 100644
index 0000000..01a6301
--- /dev/null
+++ b/src/Library/Infrastructure/Repositories/PostgreSQL/ClassMethodRepository.cs
@@ -0,0 +1,11 @@
+using NetModular.Lib.Data.Abstractions;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.PostgreSQL
+{
+    public class ClassMethodRepository : SqlServer.ClassMethodRepository
+    {
+        public ClassMethodRepository(IDbContext context) : base(context)
+        {
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Repositories/PostgreSQL/ClassRepository.cs b/src/Library/Infrastructure/Repositories/PostgreSQL/ClassRepository.cs
new file mode 100644
index 0000000..db58f20
--- /dev/null
+++ b/src/Library/Infrastructure/Repositories/PostgreSQL/ClassRepository.cs
@@ -0,0 +1,11 @@
+using NetModular.Lib.Data.Abstractions;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.PostgreSQL
+{
+    public class ClassRepository : SqlServer.ClassRepository
+    {
+        public ClassRepository(IDbContext context) : base(context)
+        {
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Repositories/PostgreSQL/EnumItemRepository.cs b/src/Library/Infrastructure/Repositories/PostgreSQL/EnumItemRepository.cs
new file mode 100644
index 0000000..5bfe250
--- /dev/null
+++ b/src/Library/Infrastructure/Repositories/PostgreSQL/EnumItemRepository.cs
@@ -0,0 +1,11 @@
+using NetModular.Lib.Data.Abstractions;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.PostgreSQL
+{
+    public class EnumItemRepository : SqlServer.EnumItemRepository
+    {
+        public EnumItemRepository(IDbContext context) : base(context)
+        {
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Repositories/PostgreSQL/EnumRepository.cs b/src/Library/Infrastructure/Repositories/PostgreSQL/EnumRepository.cs
new file mode 100644
index 0000000..39b1887
--- /dev/null
+++ b/src/Library/Infrastructure/Repositories/PostgreSQL/EnumRepository.cs
@@ -0,0 +1,11 @@
+using NetModular.Lib.Data.Abstractions;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.PostgreSQL
+{
+    public class EnumRepository : SqlServer.EnumRepository
+    {
+        public EnumRepository(IDbContext context) : base(context)
+        {
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Repositories/PostgreSQL/ModelPropertyRepository.cs b/src/Library/Infrastructure/Repositories/PostgreSQL/ModelPropertyRepository.cs
new file mode 100644
index 0000000..c739b6f
--- /dev/null
+++ b/src/Library/Infrastructure/Repositories/PostgreSQL/ModelPropertyRepository.cs
@@ -0,0 +1,11 @@
+using NetModular.Lib.Data.Abstractions;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.PostgreSQL
+{
+    public class ModelPropertyRepository : SqlServer.ModelPropertyRepository
+    {
+        public ModelPropertyRepository(IDbContext context) : base(context)
+        {
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Repositories/PostgreSQL/ModuleRepository.cs b/src/Library/Infrastructure/Repositories/PostgreSQL/ModuleRepository.cs
new file mode 100644
index 0000000..c840d30
--- /dev/null
+++ b/src/Library/Infrastructure/Repositories/PostgreSQL/ModuleRepository.cs
@@ -0,0 +1,11 @@
+using NetModular.Lib.Data.Abstractions;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.PostgreSQL
+{
+    public class ModuleRepository : SqlServer.ModuleRepository
+    {
+        public ModuleRepository(IDbContext context) : base(context)
+        {
+        }
+    }
+}
diff --git a/src/Library/Infrastructure/Repositories/PostgreSQL/OnlineModuleRepository.cs b/src/Library/Infrastructure/Repositories/PostgreSQL/OnlineModuleRepository.cs
index e742fd5..f2a9924 100644
--- a/src/Library/Infrastructure/Repositories/PostgreSQL/OnlineModuleRepository.cs
+++ b/src/Library/Infrastructure/Repositories/PostgreSQL/OnlineModuleRepository.cs
@@ -1,4 +1,4 @@
-    using NetModular.Lib.Data.Abstractions;
+using NetModular.Lib.Data.Abstractions;
 
 namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.PostgreSQL
 {
diff --git a/src/Library/Infrastructure/Repositories/PostgreSQL/PropertyRepository.cs b/src/Library/Infrastructure/Repositories/PostgreSQL/PropertyRepository.cs
new file mode 100644
index 0000000..cb45e79
--- /dev/null
+++ b/src/Library/Infrastructure/Repositories/PostgreSQL/PropertyRepository.cs
@@ -0,0 +1,11 @@
+using NetModular.Lib.Data.Abstractions;
+
+namespace NetModular.Module.CodeGenerator.Infrastructure.Repositories.PostgreSQL
+{
+    public class PropertyRepository : SqlServer.PropertyRepository
+    {
+        public PropertyRepository(IDbContext context) : base(context)
+        {
+        }
+    }
+}
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index ea417e1..e74b82c 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -10,13 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.14" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.19" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.19" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.19" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.23" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.23" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.23" />
     <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.8" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.21" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.23" />
     <PackageReference Include="NetModular.Lib.OSS.Local" Version="1.9.4" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.22" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.23" />
   </ItemGroup>
 
   <ItemGroup>

From 676ecb7ad6176b662e2d7e43d0abc2ff38da6db8 Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Tue, 19 May 2020 15:59:35 +0800
Subject: [PATCH 57/71] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B9=B1=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/SQLite/Nm_Admin.db                       | Bin 192512 -> 196608 bytes
 src/Directory.Build.props                     |   2 +-
 src/Library/Application/Application.csproj    |   2 +-
 src/Library/Domain/Domain.csproj              |   4 ++--
 .../Infrastructure/Infrastructure.csproj      |   2 +-
 src/UI/module-codegenerator/package.json      |   4 ++--
 src/Web/Controllers/ModuleController.cs       |   2 +-
 src/Web/Web.csproj                            |   2 +-
 src/WebHost/WebHost.csproj                    |   8 ++++----
 .../_modules/02_CodeGenerator/_module.json    |   2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index 9fbf952f1e6fff0cbf91ebde199c31fb9ec8ae35..3caa1bd7dbc0468f5b4edda7f824a30b5a95590e 100644
GIT binary patch
delta 1110
zcmaKrO-K|`0LN$E?&jLMjvuY2m9D`eD30&@V+h;`gAxiVE8YB9*DXXT2oXYxWfg)>
zO5og*j$Hzg*h@svp-YFr4qk-vkP$|7=}-v0c3b1YBFt%q-|zkT|KH?3Msm5DrDLH+
z%d+5dyw7f28~=5|o>)&^eD=Pz+S$<WE$IAqemXy#U1!JHcD9^NXQR*-w_i9R{jqnr
zu-R*WzSBoJ(+|(WY&t_>noBjA$xbLn3E?C=NioE*2eKZ_<A`|-dl<WvawrrUeY3<L
z?ycH|y;V?^Y>n7atM+U3L(N>|QuW<%*P(Zz+ra@aZATy1*L@G<Q^WqfUGO@FRMEsd
zgj@kJ;SvRwd^7_xfJnci+ddu^!t>C=$WUQ61J2k-_6aCmor`f!yA7bB2;}3}8?3?h
z=0q%U0{Nf5fwO+s0H95*=f6N`0pddPSwm1dF`v3-L?j-BE<secA#73+xM~2{BhVF6
zGLF@$83Sl6MeHB^8?iIdl8Ck3@^cw57VV#$n%#N1^5xa?{K+XFje)MV`TOPC|0UP8
zOBX^;31;UEZ@H^0W>*?uu4D{CCYve%`Hsu}$~0JP-Y=)PEEiNt%&q4J5-Mgd%<Y0l
zfum7<d&0p*t9GkqFY@&8gYc88WN16MxL#j36VxkD7>!5|Nf#?jDN#<qu$DVd8-VaA
zbd^F1BI3QR2#gy5_lR@}#8M$-w^slbM#ju;G{IcNmEcUY89@0SjUIfDw1Da(5#~%K
z4M9_B<)M-C%I%5y`aa;VrNMbWej412?f1<+BwVRuU>h2a@}f7))XXEwMG`T>NQVKG
VQ>PA2tp)n`kw^)pIt@W--#-G!7Ty2=

delta 172
zcmV;d08{^ffDC}(3y>QH0ssI2FOeWW0RpjL`c45-vs+K8&=?30*Z=?k051>w5B3l7
z59|-;58@Bq57@UHzyZ7ux7aTM=5Ie^FfcG<W-&81WnyJCI5{^sVmM|pIW#ghW;0_o
zHDhBkFfuSLFf}bPG9WQHIx{#rF*hzWIWRIXGBaMWLK%nsp8>c1p8^L!3Ihyw01oO6
a)C_jB5fEq$1A<#pmvQ9+z_&T=0>=WUQ#Wt`

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index e2db2fb..c7b35be 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.7.11</Version>
+		<Version>1.7.12</Version>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index d09f880..b52d753 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.23" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.24" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.5" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 1d200df..5425533 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.23" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.23" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.24" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.24" />
     <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.14" />
   </ItemGroup>
   
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index a730f08..7f98328 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -7,7 +7,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.4" />
 		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="1.9.2" />
-		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.23" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.24" />
 		<PackageReference Include="System.CodeDom" Version="4.7.0" />
 	</ItemGroup>
 
diff --git a/src/UI/module-codegenerator/package.json b/src/UI/module-codegenerator/package.json
index 6fae7c6..c740331 100644
--- a/src/UI/module-codegenerator/package.json
+++ b/src/UI/module-codegenerator/package.json
@@ -17,8 +17,8 @@
     "pub": "cd ../../../script && npm_publish.ps1"
   },
   "dependencies": {
-    "netmodular-module-admin": "^1.4.6",
-    "netmodular-ui": "^1.7.13"
+    "netmodular-module-admin": "^1.4.7",
+    "netmodular-ui": "^1.8.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.2.3",
diff --git a/src/Web/Controllers/ModuleController.cs b/src/Web/Controllers/ModuleController.cs
index c92b584..354c765 100644
--- a/src/Web/Controllers/ModuleController.cs
+++ b/src/Web/Controllers/ModuleController.cs
@@ -65,7 +65,7 @@ public Task<IResultModel> Update(ModuleUpdateModel model)
         public async Task<IActionResult> BuildCode(ModuleBuildCodeModel model)
         {
             var result = await _service.BuildCode(model);
-            return PhysicalFile(result.Data.ZipPath, "application/octet-stream", HttpUtility.UrlEncode(result.Data.Name), true);
+            return PhysicalFile(result.Data.ZipPath, "application/octet-stream", result.Data.Name, true);
         }
     }
 }
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 469b02d..cbed2e1 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.9" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.10" />
     <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.7" />
     <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.14" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.6" />
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index e74b82c..d450b22 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -10,13 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.14" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.23" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.23" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.23" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.24" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.24" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.24" />
     <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.8" />
     <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.23" />
     <PackageReference Include="NetModular.Lib.OSS.Local" Version="1.9.4" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.23" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.24" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index 62defbd..7ca1452 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.10","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.11","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}

From 0c1489d913f6f873b900410ecdce6e4b3e4744fe Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Tue, 19 May 2020 16:15:11 +0800
Subject: [PATCH 58/71] update

---
 src/WebHost/_modules/02_CodeGenerator/_module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index 7ca1452..06992d6 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.11","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.12","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}

From 174a352a9607c4f957f70192865509520de51ca0 Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Thu, 21 May 2020 15:53:07 +0800
Subject: [PATCH 59/71] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9C=AA=E8=B0=83=E6=95=B4=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                                     | 2 +-
 src/Library/Infrastructure/Infrastructure.csproj              | 3 +++
 .../Templates/Default/T4/src/UI/App/src/views/index/Index.cs  | 4 ++--
 .../Templates/Default/T4/src/UI/App/src/views/index/Index.tt  | 2 +-
 src/WebHost/_modules/02_CodeGenerator/_module.json            | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index c7b35be..73e1033 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.7.12</Version>
+		<Version>1.7.13</Version>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 7f98328..41949ae 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -593,6 +593,9 @@
 	  <Compile Update="Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
+	  <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Index.cs">
+	    <DesignTime>True</DesignTime>
+	  </Compile>
 	  <Compile Update="Templates\Default\T4\src\WebHost\AppSettings.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
index 5b06ad5..adeee1b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.cs
@@ -84,8 +84,8 @@ public virtual string TransformText()
             
             #line default
             #line hidden
-            this.Write("-button-has :options=\"buttons.add\" @click=\"add\" />\r\n      </template>\r\n\r\n      <!" +
-                    "--�Զ�����-->\r\n      <!-- <template v-slot:col-name=\"{row}\">\r\n        <");
+            this.Write("-button v-bind=\"buttons.add\" @click=\"add\" />\r\n      </template>\r\n\r\n      <!--�Զ�����" +
+                    "-->\r\n      <!-- <template v-slot:col-name=\"{row}\">\r\n        <");
             
             #line 22 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\views\index\Index.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_uiPrefix));
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
index 6300a33..67647f8 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/views/index/Index.tt
@@ -14,7 +14,7 @@
 
       <!--按钮-->
       <template v-slot:querybar-buttons>
-        <<#= _uiPrefix #>-button-has :options="buttons.add" @click="add" />
+        <<#= _uiPrefix #>-button v-bind="buttons.add" @click="add" />
       </template>
 
       <!--自定义列-->
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index 06992d6..4eeaa04 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.12","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.13","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}

From 838d381b2339f4de7e6a9d029b713f56543b1804 Mon Sep 17 00:00:00 2001
From: Oldli <wenju1991@163.com>
Date: Sat, 6 Jun 2020 23:36:05 +0800
Subject: [PATCH 60/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                        |  2 +-
 src/Library/Application/Application.csproj       |  2 +-
 src/Library/Domain/Domain.csproj                 |  6 +++---
 src/Library/Infrastructure/Infrastructure.csproj |  7 +++++--
 .../Templates/Default/T4/src/UI/App/VueConfig.cs | 16 +++++++++-------
 .../Templates/Default/T4/src/UI/App/VueConfig.tt |  2 ++
 src/UI/module-codegenerator/vue.config.js        |  2 ++
 src/Web/Web.csproj                               |  6 +++---
 src/WebHost/WebHost.csproj                       | 16 ++++++++--------
 .../_modules/02_CodeGenerator/_module.json       |  2 +-
 .../Infrastructure.Test.csproj                   |  4 ++--
 11 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 73e1033..92b3cc2 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.7.13</Version>
+		<Version>1.7.14</Version>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index b52d753..7109cee 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.24" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.28" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.5" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 5425533..1041509 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.24" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.24" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.14" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.28" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.28" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.15" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 41949ae..8d69b4a 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -6,8 +6,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.4" />
-		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="1.9.2" />
-		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.24" />
+		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="1.9.3" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.25" />
 		<PackageReference Include="System.CodeDom" Version="4.7.0" />
 	</ItemGroup>
 
@@ -596,6 +596,9 @@
 	  <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Index.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
+	  <Compile Update="Templates\Default\T4\src\UI\App\VueConfig.cs">
+	    <DesignTime>True</DesignTime>
+	  </Compile>
 	  <Compile Update="Templates\Default\T4\src\WebHost\AppSettings.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
index 27fe4b9..e33c905 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
@@ -35,6 +35,8 @@ public virtual string TransformText()
             #line hidden
             this.Write(@"'
 process.env.VUE_APP_BUILD_TIME = require('dayjs')().format('YYYYMDHHmmss')
+/**���������������д��ʾ����<script src=""./lib/font.js""></script> */
+process.env.VUE_APP_CUSTOM_SCRIPTS = ''
 
 const path = require('path')
 // ��������
@@ -48,14 +50,14 @@ public virtual string TransformText()
   devServer: {
     port: ");
             
-            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 21 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.No + 5220));
             
             #line default
             #line hidden
             this.Write("\r\n  },\r\n  transpileDependencies: [\'");
             
-            #line 21 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 23 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -63,7 +65,7 @@ public virtual string TransformText()
             this.Write("-*\', \'element-ui\'],\r\n  configureWebpack() {\r\n    let config = {\r\n      plugins: [" +
                     "\r\n        /**\r\n         * ����");
             
-            #line 26 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 28 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -71,7 +73,7 @@ public virtual string TransformText()
             this.Write("-ui/publicĿ¼�µ��ļ������Ŀ¼\r\n         */\r\n        new CopyWebpackPlugin([\r\n          {\r" +
                     "\n            from: path.join(__dirname, \'node_modules/");
             
-            #line 30 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 32 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -117,7 +119,7 @@ public virtual string TransformText()
     /**
      * ����index.htmlģ��·����ʹ��");
             
-            #line 69 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 71 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -125,7 +127,7 @@ public virtual string TransformText()
             this.Write("-ui/public�е�ģ��\r\n     */\r\n    config.plugin(\'html\').tap(args => {\r\n      args[0].t" +
                     "emplate = \'./node_modules/");
             
-            #line 72 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 74 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -157,7 +159,7 @@ public virtual string TransformText()
               priority: 10,
               test: /[\\/]node_modules[\\/]");
             
-            #line 97 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
+            #line 99 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\VueConfig.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
index 205590f..cbbc38d 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
@@ -5,6 +5,8 @@ const TerserPlugin = require('terser-webpack-plugin')
 // 增加环境变量
 process.env.VUE_APP_COPYRIGHT = '<#= _model.Module.Copyright #>'
 process.env.VUE_APP_BUILD_TIME = require('dayjs')().format('YYYYMDHHmmss')
+/**第三方依赖组件，写法示例：<script src="./lib/font.js"></script> */
+process.env.VUE_APP_CUSTOM_SCRIPTS = ''
 
 const path = require('path')
 // 开发环境
diff --git a/src/UI/module-codegenerator/vue.config.js b/src/UI/module-codegenerator/vue.config.js
index 7d5689b..01f900f 100644
--- a/src/UI/module-codegenerator/vue.config.js
+++ b/src/UI/module-codegenerator/vue.config.js
@@ -4,6 +4,8 @@ const TerserPlugin = require('terser-webpack-plugin')
 // 增加环境变量
 process.env.VUE_APP_COPYRIGHT = '版权所有：尼古拉斯·老李 | 用代码改变世界'
 process.env.VUE_APP_BUILD_TIME = require('dayjs')().format('YYYYMDHHmmss')
+/**第三方依赖组件，写法示例：<script src="./lib/font.js"></script> */
+process.env.VUE_APP_CUSTOM_SCRIPTS = ''
 
 const path = require('path')
 // 开发环境
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index cbed2e1..78ec4e3 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.10" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.7" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.14" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.11" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.8" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.15" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.6" />
   </ItemGroup>
   
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index d450b22..57b6e4a 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -9,14 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.14" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.24" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.24" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.24" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.8" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.23" />
-    <PackageReference Include="NetModular.Lib.OSS.Local" Version="1.9.4" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.24" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.17" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.28" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.28" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.28" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.10" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.27" />
+    <PackageReference Include="NetModular.Lib.OSS.Local" Version="1.9.6" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.25" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index 4eeaa04..ce74b38 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.13","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.14","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
diff --git a/test/Infrastructure.Test/Infrastructure.Test.csproj b/test/Infrastructure.Test/Infrastructure.Test.csproj
index ecb231e..f37f14d 100644
--- a/test/Infrastructure.Test/Infrastructure.Test.csproj
+++ b/test/Infrastructure.Test/Infrastructure.Test.csproj
@@ -9,11 +9,11 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.2.1">
+    <PackageReference Include="coverlet.collector" Version="1.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From de9d9713b4295975fc42c07c9c67d695c979d38b Mon Sep 17 00:00:00 2001
From: OLDLI <wenju1991@163.com>
Date: Sat, 1 Aug 2020 11:29:41 +0800
Subject: [PATCH 61/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                        |  2 +-
 src/Library/Application/Application.csproj       |  4 ++--
 src/Library/Domain/Domain.csproj                 |  6 +++---
 src/Library/Infrastructure/Infrastructure.csproj |  6 +++---
 src/Web/Web.csproj                               |  8 ++++----
 src/WebHost/WebHost.csproj                       | 16 ++++++++--------
 .../_modules/02_CodeGenerator/_module.json       |  2 +-
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 92b3cc2..b7a3902 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.7.14</Version>
+		<Version>1.8.0</Version>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 7109cee..7fd3791 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.28" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="1.9.5" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="2.0.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index 1041509..c944f0b 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="1.9.28" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="1.9.28" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="1.9.15" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="2.0.0" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 8d69b4a..385ff8f 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -5,9 +5,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.4" />
-		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="1.9.3" />
-		<PackageReference Include="NetModular.Module.Admin.Domain" Version="1.9.25" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.6" />
+		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="2.0.0" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="2.0.0" />
 		<PackageReference Include="System.CodeDom" Version="4.7.0" />
 	</ItemGroup>
 
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 78ec4e3..0f786f3 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="1.9.11" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="1.9.8" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="1.9.15" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="1.9.6" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="2.0.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 57b6e4a..3d3ae88 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -9,14 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="1.9.17" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="1.9.28" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="1.9.28" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="1.9.28" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="1.9.10" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="1.9.27" />
-    <PackageReference Include="NetModular.Lib.OSS.Local" Version="1.9.6" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="1.9.25" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.OSS.Local" Version="2.0.0" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index ce74b38..dda9518 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.7.14","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.8.0","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}

From e070731a231463a90bc51e70ce340ebef3b9df86 Mon Sep 17 00:00:00 2001
From: OLDLI <wenju1991@163.com>
Date: Thu, 15 Oct 2020 08:37:13 +0800
Subject: [PATCH 62/71] upgrade nuget

---
 src/Directory.Build.props                           |  2 +-
 src/Library/Application/Application.csproj          |  2 +-
 src/Library/Domain/Domain.csproj                    |  4 ++--
 src/Library/Infrastructure/Infrastructure.csproj    |  4 ++--
 src/Web/Web.csproj                                  |  2 +-
 src/WebHost/WebHost.csproj                          | 10 +++++-----
 src/WebHost/_modules/02_CodeGenerator/_module.json  |  2 +-
 test/Infrastructure.Test/Infrastructure.Test.csproj |  4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b7a3902..1bba515 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.8.0</Version>
+		<Version>1.8.1</Version>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 7fd3791..03edc92 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.0.7" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="2.0.0" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index c944f0b..be6ccb8 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="2.0.0" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="2.0.7" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.0.7" />
     <PackageReference Include="NetModular.Lib.Utils.Core" Version="2.0.0" />
   </ItemGroup>
   
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 385ff8f..9d071a4 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -5,9 +5,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.6" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.9" />
 		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="2.0.0" />
-		<PackageReference Include="NetModular.Module.Admin.Domain" Version="2.0.0" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="2.0.7" />
 		<PackageReference Include="System.CodeDom" Version="4.7.0" />
 	</ItemGroup>
 
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 0f786f3..83b51fd 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="2.0.1" />
     <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="2.0.0" />
     <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="2.0.0" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="2.0.0" />
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 3d3ae88..b455579 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -10,13 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="2.0.0" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="2.0.0" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="2.0.0" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="2.0.7" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="2.0.7" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="2.0.7" />
     <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="2.0.0" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="2.0.1" />
     <PackageReference Include="NetModular.Lib.OSS.Local" Version="2.0.0" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="2.0.0" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="2.0.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index dda9518..72a7ed3 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.8.0","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.8.1","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
diff --git a/test/Infrastructure.Test/Infrastructure.Test.csproj b/test/Infrastructure.Test/Infrastructure.Test.csproj
index f37f14d..3f6f494 100644
--- a/test/Infrastructure.Test/Infrastructure.Test.csproj
+++ b/test/Infrastructure.Test/Infrastructure.Test.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From e389c9ac2f83f10a98f5feec2b3fb3ee9e3cab2d Mon Sep 17 00:00:00 2001
From: OLDLI <wenju1991@163.com>
Date: Fri, 23 Oct 2020 21:29:27 +0800
Subject: [PATCH 63/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7NuGet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/SQLite/Nm_Admin.db                       | Bin 196608 -> 217088 bytes
 src/Directory.Build.props                     |   2 +-
 src/Library/Application/Application.csproj    |   4 ++--
 src/Library/Domain/Domain.csproj              |   6 +++---
 .../Infrastructure/Infrastructure.csproj      |   4 ++--
 src/Web/Web.csproj                            |   8 ++++----
 src/WebHost/WebHost.csproj                    |  16 ++++++++--------
 .../_modules/02_CodeGenerator/_module.json    |   2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
index 3caa1bd7dbc0468f5b4edda7f824a30b5a95590e..2eca3aca1ace159a8614f86dee306b39e627c46b 100644
GIT binary patch
delta 558
zcmZo@;AvREJ3(4dl7WH26o_F!Vxo>QqvXbf`TUH6n*<mexPcN(e6JYz%lTey78D5K
z<Ki!8=nCaf6<3s;+&JHL^7?sw%och^lO5)pvox|Xa!#(E@6KwZXQ*c|dE-3GO$!(|
zu<`$35M){~ojrh2j=7gPVPa3#_DKPZ=a?qXX3^d5lFK-mX|n>`ZBA_tkRy0`!WsA(
z;uyH*a0GHFu_v)rvf8k0W{zj%VTj|q%72;n8?O&f!(>4L0~Vl4j_pwijDNXVfEqQY
zN9QoAS~Pkpu!}1zGd4w*Bqrsg2Ic3Z#ygdkl;r0jF-@I=TpdGP6+#@Hd|VZxK{Au)
zbH}p;B&MfMe~`;4HvLWxqm-3qqq;o1xV$`LlPtn8kQ%U2AchI1LGd8*$sd_aCg0*#
zftx7esM#1J$1bj|&DfNWWLRoZZf0?DCe(ESaIP_?!PDdO8SO!aPUhybF=(uoVHcN_
zWNZ!un--FqmzY-qAq`RWLIful^0`jdXJMb-pTx*L{ahwv8MCIg?BuyDGW-w)@rDrE
YsI7o;Spn08Z3~!K1h%sjF#WLy0Ctn7XaE2J

delta 238
zcmZozz}wKkGeKHVn1O-80El5gWTK8SqwvOr`TUIBn*<mexcSQ&nD`PH_!9VDZ59*=
z;p1v#XXFg!P!(5{oZL9yaq{YUlbFr*EG9e5H)jDF(mA<$zB{X-o~54U<c;$zH!Wb?
zz{YWsftyWXI(q=4+{Dh@?UMo+&oQxZoMbw%ePS@9IpgHnEV@80W5nh&EPt8V_<t~H
zT8mCz$Re@*c?6>ryE@QR0fsmR{_FhmeD%C8yy86JTyr=AIh5Fw*eY3VST-}qGx9LR
hO%@a|+a8y|_>+74f*{5Q=E)~HG}{UomlZHg004rkKFI(8

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 1bba515..7abb331 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.8.1</Version>
+		<Version>1.8.2</Version>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 03edc92..a39b642 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.0.7" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="2.1.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index be6ccb8..d1fb2e3 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="2.0.7" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.0.7" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="2.1.0" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 9d071a4..3dae1d1 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -6,8 +6,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.9" />
-		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="2.0.0" />
-		<PackageReference Include="NetModular.Module.Admin.Domain" Version="2.0.7" />
+		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="2.1.0" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="2.1.0" />
 		<PackageReference Include="System.CodeDom" Version="4.7.0" />
 	</ItemGroup>
 
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 83b51fd..10ce8ec 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="2.0.1" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="2.0.0" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="2.0.0" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="2.0.0" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="2.1.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index b455579..9073ced 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -9,14 +9,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="2.0.0" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="2.0.7" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="2.0.7" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="2.0.7" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="2.0.0" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="2.0.1" />
-    <PackageReference Include="NetModular.Lib.OSS.Local" Version="2.0.0" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="2.0.7" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.OSS.Local" Version="2.1.0" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index 72a7ed3..3095436 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.8.1","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.8.2","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}

From 73b3bc2d5d993990cecc252fd33dcfd1ac4d2e23 Mon Sep 17 00:00:00 2001
From: OLDLi <wenju1991@163.com>
Date: Mon, 7 Dec 2020 12:59:52 +0800
Subject: [PATCH 64/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UI/module-codegenerator/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/UI/module-codegenerator/package.json b/src/UI/module-codegenerator/package.json
index c740331..3aaf945 100644
--- a/src/UI/module-codegenerator/package.json
+++ b/src/UI/module-codegenerator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "netmodular-module-codegenerator",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "author": "Oldli",
   "code": "codeGenerator",
   "title": "代码生成",
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "netmodular-module-admin": "^1.4.7",
-    "netmodular-ui": "^1.8.1"
+    "netmodular-ui": "^2.0.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.2.3",

From c56d308c84a49c3e2877c7a2f38229420ddfaa82 Mon Sep 17 00:00:00 2001
From: OLDLi <wenju1991@163.com>
Date: Thu, 17 Dec 2020 20:28:36 +0800
Subject: [PATCH 65/71] update

---
 data/SQLite/Nm_Admin.db                        | Bin 217088 -> 0 bytes
 data/SQLite/Nm_CodeGenerator.db                | Bin 69632 -> 0 bytes
 src/Library/Application/Application.csproj     |   2 +-
 src/Library/Domain/Domain.csproj               |   6 +++---
 .../Infrastructure/Infrastructure.csproj       |   9 ++++++---
 .../Templates/Default/T4/src/UI/App/Package.cs |   2 +-
 .../Templates/Default/T4/src/UI/App/Package.tt |   2 +-
 src/Web/Web.csproj                             |   4 ++--
 src/WebHost/WebHost.csproj                     |  12 ++++++------
 src/WebHost/appsettings.json                   |   2 +-
 .../Infrastructure.Test.csproj                 |   2 +-
 11 files changed, 22 insertions(+), 19 deletions(-)
 delete mode 100644 data/SQLite/Nm_Admin.db
 delete mode 100644 data/SQLite/Nm_CodeGenerator.db

diff --git a/data/SQLite/Nm_Admin.db b/data/SQLite/Nm_Admin.db
deleted file mode 100644
index 2eca3aca1ace159a8614f86dee306b39e627c46b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217088
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
Gf&T|lPho=q

diff --git a/data/SQLite/Nm_CodeGenerator.db b/data/SQLite/Nm_CodeGenerator.db
deleted file mode 100644
index 208a7f9829b2fd5ce3be1ec34996d22984863c5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69632
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
X0SG_<0uX=z1pW&GyZZkFuTcC4M$mKl

diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index a39b642..7a8318c 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.1.5" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="2.1.0" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index d1fb2e3..fc3acd0 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="2.1.5" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.1.5" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="2.1.2" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 3dae1d1..6333795 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -5,10 +5,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.9" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
 		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="2.1.0" />
-		<PackageReference Include="NetModular.Module.Admin.Domain" Version="2.1.0" />
-		<PackageReference Include="System.CodeDom" Version="4.7.0" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="2.1.3" />
+		<PackageReference Include="System.CodeDom" Version="5.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -593,6 +593,9 @@
 	  <Compile Update="Templates\Default\T4\src\Library\Infrastructure\ModuleServicesConfigurator.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
+	  <Compile Update="Templates\Default\T4\src\UI\App\Package.cs">
+	    <DesignTime>True</DesignTime>
+	  </Compile>
 	  <Compile Update="Templates\Default\T4\src\UI\App\src\views\index\Index.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
index 97c0001..f9919a8 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.cs
@@ -83,7 +83,7 @@ public virtual string TransformText()
   },
   ""dependencies"": {
     ""netmodular-module-admin"": ""^1.3.4"",
-    ""netmodular-ui"": ""^1.7.7""
+    ""netmodular-ui"": ""^2.0.0""
   },
   ""devDependencies"": {
     ""@vue/cli-plugin-babel"": ""^4.3.1"",
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
index b13ebeb..a0f8e61 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/Package.tt
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "netmodular-module-admin": "^1.3.4",
-    "netmodular-ui": "^1.7.7"
+    "netmodular-ui": "^2.0.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.3.1",
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 10ce8ec..b2a5793 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -7,8 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Auth.Web" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="2.1.2" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="2.1.2" />
     <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="2.1.0" />
   </ItemGroup>
   
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 9073ced..212c1a9 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -10,13 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="2.1.5" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="2.1.5" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="2.1.5" />
     <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.OSS.Local" Version="2.1.0" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="2.1.5" />
+    <PackageReference Include="NetModular.Lib.OSS.Local" Version="2.1.1" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="2.1.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/appsettings.json b/src/WebHost/appsettings.json
index b72fdc8..9ff2675 100644
--- a/src/WebHost/appsettings.json
+++ b/src/WebHost/appsettings.json
@@ -44,7 +44,7 @@
     //数据库版本
     "Version": "",
     //数据库地址
-    "Server": "../../data/SQLite",
+    "Server": "",
     //端口号
     "Port": 0,
     //用户名
diff --git a/test/Infrastructure.Test/Infrastructure.Test.csproj b/test/Infrastructure.Test/Infrastructure.Test.csproj
index 3f6f494..56304ed 100644
--- a/test/Infrastructure.Test/Infrastructure.Test.csproj
+++ b/test/Infrastructure.Test/Infrastructure.Test.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>

From 70ff7ecd2f37d50aedb28a1b4bb142cc7fdbbfa4 Mon Sep 17 00:00:00 2001
From: Mumumi <hjjixx@hotmail.com>
Date: Fri, 19 Mar 2021 10:27:07 +0800
Subject: [PATCH 66/71] =?UTF-8?q?feat:=20=E5=89=8D=E7=AB=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4=E7=9B=B8=E5=AF=B9=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs | 2 +-
 .../Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt | 2 +-
 .../Templates/Default/T4/src/UI/App/src/config/Config.cs        | 2 +-
 .../Templates/Default/T4/src/UI/App/src/config/Config.tt        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
index e33c905..17d0024 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.cs
@@ -46,7 +46,7 @@ public virtual string TransformText()
 
 module.exports = {
   outputDir: outputDir,
-  publicPath: '/app',
+  publicPath: './',
   devServer: {
     port: ");
             
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
index cbbc38d..85f54a7 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/VueConfig.tt
@@ -16,7 +16,7 @@ const outputDir = '../../WebHost/wwwroot/app'
 
 module.exports = {
   outputDir: outputDir,
-  publicPath: '/app',
+  publicPath: './',
   devServer: {
     port: <#= _model.Module.No + 5220 #>
   },
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.cs b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.cs
index 5602d06..d73e534 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.cs
@@ -26,7 +26,7 @@ public partial class Config : ConfigBase
         public virtual string TransformText()
         {
             this.Write("const isDev = process.env.NODE_ENV !== \'production\'\r\n\r\nconst config = {\r\n  baseUr" +
-                    "l: \'/api/\'\r\n}\r\n\r\n// ����ģʽ\r\nif (isDev) {\r\n  config.baseUrl = \'http://localhost:");
+                    "l: \'../api/\'\r\n}\r\n\r\n// ����ģʽ\r\nif (isDev) {\r\n  config.baseUrl = \'http://localhost:");
             
             #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\UI\App\src\config\Config.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(6220 + _model.Module.No));
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.tt b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.tt
index 54a0ae0..b0fd16c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/UI/App/src/config/Config.tt
@@ -2,7 +2,7 @@
 const isDev = process.env.NODE_ENV !== 'production'
 
 const config = {
-  baseUrl: '/api/'
+  baseUrl: '../api/'
 }
 
 // 开发模式

From 269e00e408b23b50ce85ecd0c12bcef22ce99e07 Mon Sep 17 00:00:00 2001
From: Mumumi <hjjixx@hotmail.com>
Date: Fri, 19 Mar 2021 17:48:34 +0800
Subject: [PATCH 67/71] =?UTF-8?q?feat:=20=E7=89=88=E6=9C=AC=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                          |  2 +-
 src/Library/Application/Application.csproj         |  2 +-
 src/Library/Domain/Domain.csproj                   |  6 +++---
 src/Library/Infrastructure/Infrastructure.csproj   |  2 +-
 src/Web/Web.csproj                                 |  4 ++--
 src/WebHost/WebHost.csproj                         | 12 ++++++------
 src/WebHost/_modules/02_CodeGenerator/_module.json |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 7abb331..210e5fe 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.8.2</Version>
+		<Version>1.8.3</Version>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 7a8318c..70827af 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.1.5" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.1.6" />
     <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="2.1.0" />
   </ItemGroup>
   
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index fc3acd0..ae358a1 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="2.1.5" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.1.5" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="2.1.2" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="2.1.6" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.1.6" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="2.1.5" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 6333795..a1706a2 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -7,7 +7,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
 		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="2.1.0" />
-		<PackageReference Include="NetModular.Module.Admin.Domain" Version="2.1.3" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="2.1.5" />
 		<PackageReference Include="System.CodeDom" Version="5.0.0" />
 	</ItemGroup>
 
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index b2a5793..efb28a9 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -8,8 +8,8 @@
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Auth.Web" Version="2.1.0" />
     <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="2.1.2" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="2.1.2" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="2.1.5" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="2.1.1" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 212c1a9..fc394b2 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -10,13 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="2.1.5" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="2.1.5" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="2.1.5" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="2.1.6" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="2.1.6" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="2.1.6" />
     <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="2.1.5" />
-    <PackageReference Include="NetModular.Lib.OSS.Local" Version="2.1.1" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="2.1.3" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="2.2.0" />
+    <PackageReference Include="NetModular.Lib.OSS.Local" Version="2.1.3" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="2.1.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index 3095436..024d12d 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.8.2","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.8.3","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}

From a7c1992045e6e926aa61a34ff52e6bdec191413f Mon Sep 17 00:00:00 2001
From: OLDLI <wenju1991@163.com>
Date: Sat, 2 Nov 2024 18:08:03 +0800
Subject: [PATCH 68/71] upgrade net9

---
 src/Directory.Build.props                     |  1 +
 src/Library/Application/Application.csproj    |  8 +---
 src/Library/Domain/Domain.csproj              | 10 ++---
 .../Infrastructure/Infrastructure.csproj      | 12 ++---
 .../Default/T4/src/DirectoryBuildProps.cs     | 31 ++++++-------
 .../Default/T4/src/DirectoryBuildProps.tt     |  1 +
 .../T4/src/Library/Application/Csproj.cs      | 22 +++++----
 .../T4/src/Library/Application/Csproj.tt      |  4 --
 .../Default/T4/src/Library/Domain/Csproj.cs   | 27 ++++++-----
 .../Default/T4/src/Library/Domain/Csproj.tt   |  4 --
 .../T4/src/Library/Infrastructure/Csproj.cs   | 27 ++++++-----
 .../T4/src/Library/Infrastructure/Csproj.tt   |  4 --
 .../Templates/Default/T4/src/Web/Csproj.cs    | 33 +++++++-------
 .../Templates/Default/T4/src/Web/Csproj.tt    |  1 -
 .../Default/T4/src/WebHost/Csproj.cs          | 45 +++++++++----------
 .../Default/T4/src/WebHost/Csproj.tt          |  3 --
 .../.vscode/settings.json                     |  4 +-
 src/Web/Web.csproj                            | 13 ++----
 src/WebHost/Program.cs                        |  3 +-
 src/WebHost/WebHost.csproj                    | 25 ++++-------
 src/WebHost/appsettings.json                  | 14 +++---
 .../Infrastructure.Test.csproj                |  8 ++--
 22 files changed, 128 insertions(+), 172 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 210e5fe..f6a0df5 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -6,6 +6,7 @@
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
 		<Version>1.8.3</Version>
+		<TargetFramework>net9.0</TargetFramework>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
 		<LangVersion>Latest</LangVersion>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 70827af..26c54b7 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -1,13 +1,9 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.1.6" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="2.1.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="9.0.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index ae358a1..a0fc436 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -1,13 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="2.1.6" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="2.1.6" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="2.1.5" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="9.0.0" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index a1706a2..c0e7ba7 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -1,14 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
-	</PropertyGroup>
-
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
-		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="2.1.0" />
-		<PackageReference Include="NetModular.Module.Admin.Domain" Version="2.1.5" />
-		<PackageReference Include="System.CodeDom" Version="5.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0-rc.2.24473.5" />
+		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="9.0.0" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="9.0.0" />
+		<PackageReference Include="System.CodeDom" Version="9.0.0-rc.2.24473.5" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
index 7ecc09b..4a2685b 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.cs
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
-//     运行时版本: 16.0.0.0
+//     运行时版本: 17.0.0.0
 //  
 //     对此文件的更改可能导致不正确的行为，如果
 //     重新生成代码，这些更改将会丢失。
@@ -15,8 +15,8 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    #line 1 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public partial class DirectoryBuildProps : DirectoryBuildPropsBase
     {
 #line hidden
@@ -25,30 +25,31 @@ public partial class DirectoryBuildProps : DirectoryBuildPropsBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("<Project>\r\n  <PropertyGroup>\r\n    <Id>");
+            this.Write("<Project>\r\n  <PropertyGroup>\r\n    <TargetFramework>net9.0</TargetFramework>\r\n    " +
+                    "<Id>");
             
-            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 5 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.No<10 ? "0" + _model.Module.No : _model.Module.No + ""));
             
             #line default
             #line hidden
             this.Write("</Id>\r\n    <Code>");
             
-            #line 5 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 6 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
             this.Write("</Code>\r\n\t<Name>");
             
-            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 7 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Name));
             
             #line default
             #line hidden
             this.Write("</Name>\r\n    <Authors>Oldli</Authors>\r\n    <Icon>");
             
-            #line 8 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 9 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Icon));
             
             #line default
@@ -57,7 +58,7 @@ public virtual string TransformText()
                     "($(Name)) - $(MSBuildProjectName)</Description>\r\n    <NoWarn>$(NoWarn);1591</NoW" +
                     "arn>\r\n    <LangVersion>Latest</LangVersion>\r\n    <RootNamespacePrefix>");
             
-            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 14 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
@@ -71,28 +72,28 @@ public virtual string TransformText()
     <PackageOutputPath>$(SolutionDir)\_packages</PackageOutputPath>
     <Company>");
             
-            #line 20 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 21 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_company));
             
             #line default
             #line hidden
             this.Write("</Company>\r\n    <Copyright>");
             
-            #line 21 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 22 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_copyright));
             
             #line default
             #line hidden
             this.Write("</Copyright>\r\n    <PackageProjectUrl>");
             
-            #line 22 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 23 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_projectUrl));
             
             #line default
             #line hidden
             this.Write("</PackageProjectUrl>\r\n    <RepositoryUrl>");
             
-            #line 23 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
+            #line 24 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\DirectoryBuildProps.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_repositoryUrl));
             
             #line default
@@ -108,7 +109,7 @@ public virtual string TransformText()
     /// <summary>
     /// Base class for this transformation
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public class DirectoryBuildPropsBase
     {
         #region Fields
@@ -123,7 +124,7 @@ public class DirectoryBuildPropsBase
         /// <summary>
         /// The string builder that generation-time code is using to assemble generated output
         /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
+        public System.Text.StringBuilder GenerationEnvironment
         {
             get
             {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
index adacf30..afa7094 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/DirectoryBuildProps.tt
@@ -1,6 +1,7 @@
 <#@ template language="C#" #>
 <Project>
   <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
     <Id><#= _model.Module.No<10 ? "0" + _model.Module.No : _model.Module.No + "" #></Id>
     <Code><#= _model.Module.Code #></Code>
 	<Name><#= _model.Module.Name #></Name>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
index 0db9cd0..e5b8771 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.cs
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
-//     运行时版本: 16.0.0.0
+//     运行时版本: 17.0.0.0
 //  
 //     对此文件的更改可能导致不正确的行为，如果
 //     重新生成代码，这些更改将会丢失。
@@ -15,8 +15,8 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    #line 1 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public partial class Csproj : CsprojBase
     {
 #line hidden
@@ -25,32 +25,30 @@ public partial class Csproj : CsprojBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n  <PropertyGroup>\r\n    <TargetFramework>nets" +
-                    "tandard2.0</TargetFramework>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n\t<PackageRefe" +
-                    "rence Include=\"");
+            this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n  <ItemGroup>\r\n\t<PackageReference Include=\"");
             
-            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
+            #line 5 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Query\" Version=\"");
             
-            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
+            #line 5 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Data_Query));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
+            #line 6 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Mapper.AutoMapper\" Version=\"");
             
-            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
+            #line 6 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Application\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Mapper_AutoMapper));
             
             #line default
@@ -67,7 +65,7 @@ public virtual string TransformText()
     /// <summary>
     /// Base class for this transformation
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public class CsprojBase
     {
         #region Fields
@@ -82,7 +80,7 @@ public class CsprojBase
         /// <summary>
         /// The string builder that generation-time code is using to assemble generated output
         /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
+        public System.Text.StringBuilder GenerationEnvironment
         {
             get
             {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
index 923211f..0194f0a 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Application/Csproj.tt
@@ -1,10 +1,6 @@
 <#@ template language="C#" #>
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
   <ItemGroup>
 	<PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="<#= _versions.Lib_Data_Query #>" />
     <PackageReference Include="<#= _prefix #>.Lib.Mapper.AutoMapper" Version="<#= _versions.Lib_Mapper_AutoMapper #>" />
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
index 1d62828..c5ecf4c 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.cs
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
-//     运行时版本: 16.0.0.0
+//     运行时版本: 17.0.0.0
 //  
 //     对此文件的更改可能导致不正确的行为，如果
 //     重新生成代码，这些更改将会丢失。
@@ -15,8 +15,8 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    #line 1 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public partial class Csproj : CsprojBase
     {
 #line hidden
@@ -25,46 +25,45 @@ public partial class Csproj : CsprojBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n  <PropertyGroup>\r\n    <TargetFramework>nets" +
-                    "tandard2.0</TargetFramework>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n    <PackageR" +
-                    "eference Include=\"");
+            this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n  <ItemGroup>\r\n    <PackageReference Include" +
+                    "=\"");
             
-            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+            #line 5 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Core\" Version=\"");
             
-            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+            #line 5 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Data_Core));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+            #line 6 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.Query\" Version=\"");
             
-            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+            #line 6 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Data_Query));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+            #line 7 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Utils.Core\" Version=\"");
             
-            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
+            #line 7 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Domain\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Utils_Core));
             
             #line default
@@ -80,7 +79,7 @@ public virtual string TransformText()
     /// <summary>
     /// Base class for this transformation
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public class CsprojBase
     {
         #region Fields
@@ -95,7 +94,7 @@ public class CsprojBase
         /// <summary>
         /// The string builder that generation-time code is using to assemble generated output
         /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
+        public System.Text.StringBuilder GenerationEnvironment
         {
             get
             {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
index 3679ec6..54dfceb 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Domain/Csproj.tt
@@ -1,10 +1,6 @@
 <#@ template language="C#" #>
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="<#= _prefix #>.Lib.Data.Core" Version="<#= _versions.Lib_Data_Core #>" />
     <PackageReference Include="<#= _prefix #>.Lib.Data.Query" Version="<#= _versions.Lib_Data_Query #>" />
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
index 8fb6d53..6092eca 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.cs
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     �˴����ɹ������ɡ�
-//     ����ʱ�汾: 16.0.0.0
+//     ����ʱ�汾: 17.0.0.0
 //  
 //     �Դ��ļ��ĸ��Ŀ��ܵ��²���ȷ����Ϊ�����
 //     �������ɴ��룬��Щ���Ľ��ᶪʧ��
@@ -15,8 +15,8 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    #line 1 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public partial class Csproj : CsprojBase
     {
 #line hidden
@@ -25,46 +25,45 @@ public partial class Csproj : CsprojBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n  <PropertyGroup>\r\n    <TargetFramework>nets" +
-                    "tandard2.0</TargetFramework>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n    <PackageR" +
-                    "eference Include=\"");
+            this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n  <ItemGroup>\r\n    <PackageReference Include" +
+                    "=\"");
             
-            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+            #line 5 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Config.Abstractions\" Version=\"");
             
-            #line 9 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+            #line 5 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Config_Abstractions));
             
             #line default
             #line hidden
             this.Write("\" />\r\n\t  <PackageReference Include=\"");
             
-            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+            #line 6 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Module.Abstractions\" Version=\"");
             
-            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+            #line 6 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Module_Abstractions));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+            #line 7 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.Admin.Domain\" Version=\"");
             
-            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
+            #line 7 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Library\Infrastructure\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Module_Admin_Domain));
             
             #line default
@@ -81,7 +80,7 @@ public virtual string TransformText()
     /// <summary>
     /// Base class for this transformation
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public class CsprojBase
     {
         #region Fields
@@ -96,7 +95,7 @@ public class CsprojBase
         /// <summary>
         /// The string builder that generation-time code is using to assemble generated output
         /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
+        public System.Text.StringBuilder GenerationEnvironment
         {
             get
             {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
index fc29504..6d636c7 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Library/Infrastructure/Csproj.tt
@@ -1,10 +1,6 @@
 <#@ template language="C#" #>
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="<#= _prefix #>.Lib.Config.Abstractions" Version="<#= _versions.Lib_Config_Abstractions #>" />
 	  <PackageReference Include="<#= _prefix #>.Lib.Module.Abstractions" Version="<#= _versions.Lib_Module_Abstractions #>" />
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
index 93c5c31..9540863 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.cs
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
-//     运行时版本: 16.0.0.0
+//     运行时版本: 17.0.0.0
 //  
 //     对此文件的更改可能导致不正确的行为，如果
 //     重新生成代码，这些更改将会丢失。
@@ -15,8 +15,8 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    #line 1 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public partial class Csproj : CsprojBase
     {
 #line hidden
@@ -25,61 +25,60 @@ public partial class Csproj : CsprojBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n  <PropertyGroup>\r\n    <TargetFramework>netc" +
-                    "oreapp3.1</TargetFramework>\r\n    <GenerateDocumentationFile>false</GenerateDocum" +
-                    "entationFile>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n\t<PackageReference Include=\"" +
-                    "");
+            this.Write("<Project Sdk=\"Microsoft.NET.Sdk\">\r\n\r\n  <PropertyGroup>\r\n    <GenerateDocumentatio" +
+                    "nFile>false</GenerateDocumentationFile>\r\n  </PropertyGroup>\r\n\r\n  <ItemGroup>\r\n\t<" +
+                    "PackageReference Include=\"");
             
-            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            #line 9 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Auth.Web\" Version=\"");
             
-            #line 10 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            #line 9 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Auth_Web));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            #line 10 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Module.AspNetCore\" Version=\"");
             
-            #line 11 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            #line 10 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Module_AspNetCore));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            #line 11 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Utils.Mvc\" Version=\"");
             
-            #line 12 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            #line 11 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Utils_Mvc));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            #line 12 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Validation.FluentValidation\" Version=\"");
             
-            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
+            #line 12 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\Web\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Validation_FluentValidation));
             
             #line default
@@ -112,7 +111,7 @@ public virtual string TransformText()
     /// <summary>
     /// Base class for this transformation
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public class CsprojBase
     {
         #region Fields
@@ -127,7 +126,7 @@ public class CsprojBase
         /// <summary>
         /// The string builder that generation-time code is using to assemble generated output
         /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
+        public System.Text.StringBuilder GenerationEnvironment
         {
             get
             {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
index f5a0370..631acaf 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/Web/Csproj.tt
@@ -2,7 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
index 4ed6c0d..50be158 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.cs
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
-//     运行时版本: 16.0.0.0
+//     运行时版本: 17.0.0.0
 //  
 //     对此文件的更改可能导致不正确的行为，如果
 //     重新生成代码，这些更改将会丢失。
@@ -15,8 +15,8 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    #line 1 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public partial class Csproj : CsprojBase
     {
 #line hidden
@@ -28,9 +28,6 @@ public virtual string TransformText()
             this.Write(@"<Project Sdk=""Microsoft.NET.Sdk.Web"">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <!--复制本地锁定的程序集到输出目录-->
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
     <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
   </PropertyGroup>
@@ -38,112 +35,112 @@ public virtual string TransformText()
   <ItemGroup>
 	<PackageReference Include=""");
             
-            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 10 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Cache.MemoryCache\" Version=\"");
             
-            #line 13 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 10 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Cache_MemoryCache));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 11 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.MySql\" Version=\"");
             
-            #line 14 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 11 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Data_MySql));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 12 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.SQLite\" Version=\"");
             
-            #line 15 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 12 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Data_SQLite));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 13 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Data.SqlServer\" Version=\"");
             
-            #line 16 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 13 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Data_SqlServer));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 14 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Excel.EPPlus\" Version=\"");
             
-            #line 17 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 14 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Excel_EPPlus));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 18 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 15 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Host.Web\" Version=\"");
             
-            #line 18 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 15 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_Host_Web));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 16 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.OSS.Local\" Version=\"");
             
-            #line 19 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 16 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Lib_OSS_Local));
             
             #line default
             #line hidden
             this.Write("\" />\r\n    <PackageReference Include=\"");
             
-            #line 20 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 17 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.Admin.Web\" Version=\"");
             
-            #line 20 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
+            #line 17 "D:\OpenModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Csproj.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_versions.Module_Admin_Web));
             
             #line default
@@ -180,7 +177,7 @@ public virtual string TransformText()
     /// <summary>
     /// Base class for this transformation
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public class CsprojBase
     {
         #region Fields
@@ -195,7 +192,7 @@ public class CsprojBase
         /// <summary>
         /// The string builder that generation-time code is using to assemble generated output
         /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
+        public System.Text.StringBuilder GenerationEnvironment
         {
             get
             {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
index 9f3ba6a..d515367 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Csproj.tt
@@ -2,9 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <!--复制本地锁定的程序集到输出目录-->
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
     <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
   </PropertyGroup>
diff --git a/src/UI/module-codegenerator/.vscode/settings.json b/src/UI/module-codegenerator/.vscode/settings.json
index df7a9ea..ef42fcf 100644
--- a/src/UI/module-codegenerator/.vscode/settings.json
+++ b/src/UI/module-codegenerator/.vscode/settings.json
@@ -4,7 +4,7 @@
   "editor.formatOnSave": true,
   "editor.formatOnType": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.tslint": true,
-    "source.fixAll.eslint": true
+    "source.fixAll.tslint": "explicit",
+    "source.fixAll.eslint": "explicit"
   }
 }
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index efb28a9..932f2c0 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -1,15 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="2.1.2" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="2.1.5" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="2.1.1" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="9.0.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/Program.cs b/src/WebHost/Program.cs
index 2213d5c..35bb1e7 100644
--- a/src/WebHost/Program.cs
+++ b/src/WebHost/Program.cs
@@ -1,4 +1,5 @@
-using NetModular.Lib.Host.Web;
+using System.Threading;
+using NetModular.Lib.Host.Web;
 
 namespace NetModular.Module.CodeGenerator.WebHost
 {
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index fc394b2..7dfbbbe 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -1,22 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <!--复制本地锁定的程序集到输出目录-->
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-    <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
-    <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="2.1.6" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="2.1.6" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="2.1.6" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="2.1.0" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="2.2.0" />
-    <PackageReference Include="NetModular.Lib.OSS.Local" Version="2.1.3" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="2.1.5" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.PostgreSQL" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.OSS.Local" Version="9.0.0" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/appsettings.json b/src/WebHost/appsettings.json
index 9ff2675..51212e3 100644
--- a/src/WebHost/appsettings.json
+++ b/src/WebHost/appsettings.json
@@ -40,21 +40,22 @@
     //是否开启日志
     "Logging": false,
     //数据库类型 0、SqlServer 1、MySql 2、SQLite
-    "Dialect": 2,
+    "Dialect": 3,
     //数据库版本
     "Version": "",
     //数据库地址
-    "Server": "",
+    "Server": "localhost",
     //端口号
-    "Port": 0,
+    "Port": 5432,
     //用户名
-    "UserId": "",
+    "UserId": "postgres",
     //密码
-    "Password": "",
+    "Password": "oldli",
     //是否创建数据库和表
     "CreateDatabase": true,
     //是否初始化数据
     "InitData": true,
+    "NpgsqlDatabaseName": "Nm_CodeGenerator",
     //模块列表
     "Modules": [
       {
@@ -64,13 +65,12 @@
         "Prefix": "",
         //数据库名称
         "Database": "Nm_Admin",
-        //自定义连接信息
-        "ConnectionString": "",
         //自定义版本号
         "Version": ""
       },
       {
         "Name": "CodeGenerator",
+        "Prefix": "",
         "Database": "Nm_CodeGenerator"
       }
     ]
diff --git a/test/Infrastructure.Test/Infrastructure.Test.csproj b/test/Infrastructure.Test/Infrastructure.Test.csproj
index 56304ed..ea36ddf 100644
--- a/test/Infrastructure.Test/Infrastructure.Test.csproj
+++ b/test/Infrastructure.Test/Infrastructure.Test.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From 2ae5b9c6be15e0097babe1b938e8229a2f758fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=96=87=E4=B8=BE?= <liwenju@ftrans.cn>
Date: Fri, 1 Aug 2025 09:40:36 +0800
Subject: [PATCH 69/71] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0.net9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish.ps1                                   | 29 +++++++++++++++++++
 src/Directory.Build.props                     |  3 +-
 .../_modules/02_CodeGenerator/_module.json    |  2 +-
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 publish.ps1

diff --git a/publish.ps1 b/publish.ps1
new file mode 100644
index 0000000..86fc01d
--- /dev/null
+++ b/publish.ps1
@@ -0,0 +1,29 @@
+# 让用户手动输入 NuGet 密钥
+$NugetApiKey = Read-Host "请输入 NuGet API Key"
+
+# 清理 _packages 目录
+if (Test-Path "_packages") {
+    Remove-Item "_packages\*" -Force
+    Write-Host "_packages 目录已清理"
+}
+
+# 编译项目
+dotnet build
+
+# 发布 nupkg 包
+$nupkgFiles = Get-ChildItem -Path "_packages" -Filter "*.nupkg"
+foreach ($pkg in $nupkgFiles) {
+    Write-Host "正在发布 nupkg 包: $($pkg.FullName)"
+    dotnet nuget push $pkg.FullName --api-key $NugetApiKey --source https://api.nuget.org/v3/index.json
+}
+
+# 发布 snupkg 包（符号包）
+$snupkgFiles = Get-ChildItem -Path "_packages" -Filter "*.snupkg"
+foreach ($spkg in $snupkgFiles) {
+    Write-Host "正在发布 snupkg 包: $($spkg.FullName)"
+    dotnet nuget push $spkg.FullName --api-key $NugetApiKey --source https://api.nuget.org/v3/index.json --symbol-source https://api.nuget.org/v3/index.json
+}
+
+# 运行结束后关闭窗口
+Write-Host "发布完成，窗口即将关闭..."
+Start-Sleep -
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f6a0df5..325aeb1 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>1.8.3</Version>
+		<Version>9.0.0</Version>
 		<TargetFramework>net9.0</TargetFramework>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
@@ -19,6 +19,7 @@
 		<PackageOutputPath>$(SolutionDir)\_packages</PackageOutputPath>
 		<Company>Oldli</Company>
 		<Copyright>Oldli</Copyright>
+		<IncludeSymbols>true</IncludeSymbols>
 		<PackageProjectUrl>https://docs.17mkh.com/</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/iamoldli/NetModular.Module.CodeGenerator</RepositoryUrl>
 	</PropertyGroup>
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index 024d12d..31cc03d 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"1.8.3","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"9.0.0","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}

From 692a216518f36ba81fcfc6c27319bd632a8a33bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=96=87=E4=B8=BE?= <liwenju@ftrans.cn>
Date: Fri, 1 Aug 2025 17:36:09 +0800
Subject: [PATCH 70/71] upgrade 9.0

---
 src/Directory.Build.props                      |  2 +-
 src/Library/Application/Application.csproj     |  4 ++--
 src/Library/Domain/Domain.csproj               |  6 +++---
 .../Infrastructure/Infrastructure.csproj       |  4 ++--
 src/Web/Web.csproj                             |  8 ++++----
 src/WebHost/Program.cs                         | 15 +++++++--------
 src/WebHost/Startup.cs                         | 13 -------------
 src/WebHost/WebHost.csproj                     | 18 +++++++++---------
 .../_modules/02_CodeGenerator/_module.json     |  2 +-
 src/WebHost/appsettings.json                   |  2 +-
 10 files changed, 30 insertions(+), 44 deletions(-)
 delete mode 100644 src/WebHost/Startup.cs

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 325aeb1..e55e2a0 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>9.0.0</Version>
+		<Version>9.0.1</Version>
 		<TargetFramework>net9.0</TargetFramework>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index 26c54b7..d3fd3bf 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -2,8 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="9.0.0" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="9.0.7" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index a0fc436..f4113db 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="9.0.0" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="9.0.0" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="9.0.7" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index c0e7ba7..316dedc 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -2,8 +2,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0-rc.2.24473.5" />
-		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="9.0.0" />
-		<PackageReference Include="NetModular.Module.Admin.Domain" Version="9.0.0" />
+		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="9.0.7" />
+		<PackageReference Include="NetModular.Module.Admin.Domain" Version="9.0.6" />
 		<PackageReference Include="System.CodeDom" Version="9.0.0-rc.2.24473.5" />
 	</ItemGroup>
 
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 932f2c0..e946d4c 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="9.0.0" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="9.0.0" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="9.0.0" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="9.0.7" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/Program.cs b/src/WebHost/Program.cs
index 35bb1e7..287e32b 100644
--- a/src/WebHost/Program.cs
+++ b/src/WebHost/Program.cs
@@ -1,13 +1,12 @@
-using System.Threading;
+using System.Threading.Tasks;
 using NetModular.Lib.Host.Web;
 
-namespace NetModular.Module.CodeGenerator.WebHost
+namespace NetModular.Module.CodeGenerator.WebHost;
+
+public class Program
 {
-    public class Program
+    public static async Task Main(string[] args)
     {
-        public static void Main(string[] args)
-        {
-            new HostBuilder().Run<Startup>(args);
-        }
+        await new HostBuilder().RunAsync(args);
     }
-}
+}
\ No newline at end of file
diff --git a/src/WebHost/Startup.cs b/src/WebHost/Startup.cs
deleted file mode 100644
index ea039f1..0000000
--- a/src/WebHost/Startup.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using NetModular.Lib.Host.Web;
-
-namespace NetModular.Module.CodeGenerator.WebHost
-{
-    public class Startup : StartupAbstract
-    {
-        public Startup(IHostEnvironment env, IConfiguration cfg) : base(env, cfg)
-        {
-        }
-    }
-}
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index 7dfbbbe..deb7550 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="9.0.0" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="9.0.0" />
-    <PackageReference Include="NetModular.Lib.Data.PostgreSQL" Version="9.0.0" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="9.0.0" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="9.0.0" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="9.0.0" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="9.0.0" />
-    <PackageReference Include="NetModular.Lib.OSS.Local" Version="9.0.0" />
-    <PackageReference Include="NetModular.Module.Admin.Web" Version="9.0.0" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Data.PostgreSQL" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="9.0.7.1" />
+    <PackageReference Include="NetModular.Lib.OSS.Local" Version="9.0.7" />
+    <PackageReference Include="NetModular.Module.Admin.Web" Version="9.0.6" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index 31cc03d..cba89c1 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"9.0.0","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"9.0.1","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
diff --git a/src/WebHost/appsettings.json b/src/WebHost/appsettings.json
index 51212e3..2034b8d 100644
--- a/src/WebHost/appsettings.json
+++ b/src/WebHost/appsettings.json
@@ -50,7 +50,7 @@
     //用户名
     "UserId": "postgres",
     //密码
-    "Password": "oldli",
+    "Password": "ftrans",
     //是否创建数据库和表
     "CreateDatabase": true,
     //是否初始化数据

From 053dbb2faf09531bf2f2f3e1375baa00bd7004cd Mon Sep 17 00:00:00 2001
From: OLDLI <wenju1991@163.com>
Date: Sat, 2 Aug 2025 21:35:50 +0800
Subject: [PATCH 71/71] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8DWebHost?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Directory.Build.props                     |   2 +-
 src/Library/Application/Application.csproj    |   4 +-
 src/Library/Domain/Domain.csproj              |   6 +-
 .../Infrastructure/Infrastructure.csproj      |   9 +-
 .../Default/T4/src/WebHost/Program.cs         |  24 +-
 .../Default/T4/src/WebHost/Program.tt         |   5 +-
 .../Default/T4/src/WebHost/Startup.Extend.cs  |  30 --
 .../Default/T4/src/WebHost/Startup.cs         | 331 ------------------
 .../Default/T4/src/WebHost/Startup.tt         |  14 -
 src/Web/Web.csproj                            |   8 +-
 src/WebHost/WebHost.csproj                    |  16 +-
 .../_modules/02_CodeGenerator/_module.json    |   2 +-
 src/WebHost/appsettings.json                  |  12 +-
 13 files changed, 41 insertions(+), 422 deletions(-)
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs
 delete mode 100644 src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.tt

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index e55e2a0..4b5487b 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,7 @@
 		<Name>代码生成</Name>
 		<Icon>develop</Icon>
 		<Authors>Oldli</Authors>
-		<Version>9.0.1</Version>
+		<Version>9.0.2</Version>
 		<TargetFramework>net9.0</TargetFramework>
 		<Description>NetModular Module $(Code)($(Name)) - $(MSBuildProjectName)</Description>
 		<NoWarn>$(NoWarn);1591</NoWarn>
diff --git a/src/Library/Application/Application.csproj b/src/Library/Application/Application.csproj
index d3fd3bf..f68657f 100644
--- a/src/Library/Application/Application.csproj
+++ b/src/Library/Application/Application.csproj
@@ -2,8 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="9.0.7" />
-    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="9.0.8" />
+    <PackageReference Include="NetModular.Lib.Mapper.AutoMapper" Version="9.0.8" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Library/Domain/Domain.csproj b/src/Library/Domain/Domain.csproj
index f4113db..dd81c50 100644
--- a/src/Library/Domain/Domain.csproj
+++ b/src/Library/Domain/Domain.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Data.Core" Version="9.0.7" />
-    <PackageReference Include="NetModular.Lib.Data.Query" Version="9.0.7" />
-    <PackageReference Include="NetModular.Lib.Utils.Core" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Data.Core" Version="9.0.8" />
+    <PackageReference Include="NetModular.Lib.Data.Query" Version="9.0.8" />
+    <PackageReference Include="NetModular.Lib.Utils.Core" Version="9.0.8" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Library/Infrastructure/Infrastructure.csproj b/src/Library/Infrastructure/Infrastructure.csproj
index 316dedc..2c750e1 100644
--- a/src/Library/Infrastructure/Infrastructure.csproj
+++ b/src/Library/Infrastructure/Infrastructure.csproj
@@ -2,7 +2,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0-rc.2.24473.5" />
-		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="9.0.7" />
+		<PackageReference Include="NetModular.Lib.Config.Abstractions" Version="9.0.8" />
 		<PackageReference Include="NetModular.Module.Admin.Domain" Version="9.0.6" />
 		<PackageReference Include="System.CodeDom" Version="9.0.0-rc.2.24473.5" />
 	</ItemGroup>
@@ -236,10 +236,6 @@
 			<Generator>TextTemplatingFilePreprocessor</Generator>
 			<LastGenOutput>Program.cs</LastGenOutput>
 		</None>
-		<None Update="Templates\Default\T4\src\WebHost\Startup.tt">
-			<Generator>TextTemplatingFilePreprocessor</Generator>
-			<LastGenOutput>Startup.cs</LastGenOutput>
-		</None>
 		<None Update="Templates\Default\T4\src\DirectoryBuildProps.tt">
 			<Generator>TextTemplatingFilePreprocessor</Generator>
 			<LastGenOutput>DirectoryBuildProps.cs</LastGenOutput>
@@ -607,9 +603,6 @@
 	  <Compile Update="Templates\Default\T4\src\WebHost\Csproj.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
-	  <Compile Update="Templates\Default\T4\src\WebHost\Startup.cs">
-	    <DesignTime>True</DesignTime>
-	  </Compile>
 	  <Compile Update="Templates\Default\T4\src\Web\ModuleInitializer.cs">
 	    <DesignTime>True</DesignTime>
 	  </Compile>
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.cs
index 4b86a3e..0f52b6f 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.cs
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.cs
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
-//     运行时版本: 16.0.0.0
+//     运行时版本: 17.0.0.0
 //  
 //     对此文件的更改可能导致不正确的行为，如果
 //     重新生成代码，这些更改将会丢失。
@@ -15,8 +15,8 @@ namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.sr
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    #line 1 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public partial class Program : ProgramBase
     {
 #line hidden
@@ -25,30 +25,30 @@ public partial class Program : ProgramBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("using ");
+            this.Write("using System.Threading.Tasks;\r\nusing ");
             
-            #line 2 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
+            #line 3 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Lib.Host.Web;\r\n\r\nnamespace ");
             
-            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
+            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
             
             #line default
             #line hidden
             this.Write(".Module.");
             
-            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
+            #line 5 "D:\MyProject\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Program.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
             
             #line default
             #line hidden
-            this.Write(".WebHost\r\n{\r\n    public class Program\r\n    {\r\n        public static void Main(str" +
-                    "ing[] args)\r\n        {\r\n            new HostBuilder().Run<Startup>(args);\r\n     " +
-                    "   }\r\n    }\r\n}\r\n");
+            this.Write(".WebHost\r\n{\r\n    public class Program\r\n    {\r\n        public static async Task Ma" +
+                    "in(string[] args)\r\n        {\r\n            await new HostBuilder().RunAsync(args)" +
+                    ";\r\n        }\r\n    }\r\n}\r\n");
             return this.GenerationEnvironment.ToString();
         }
     }
@@ -59,7 +59,7 @@ public virtual string TransformText()
     /// <summary>
     /// Base class for this transformation
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public class ProgramBase
     {
         #region Fields
@@ -74,7 +74,7 @@ public class ProgramBase
         /// <summary>
         /// The string builder that generation-time code is using to assemble generated output
         /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
+        public System.Text.StringBuilder GenerationEnvironment
         {
             get
             {
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.tt
index a0c3473..9c01a80 100644
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.tt
+++ b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Program.tt
@@ -1,13 +1,14 @@
 <#@ template language="C#" #>
+using System.Threading.Tasks;
 using <#= _prefix #>.Lib.Host.Web;
 
 namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.WebHost
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static async Task Main(string[] args)
         {
-            new HostBuilder().Run<Startup>(args);
+            await new HostBuilder().RunAsync(args);
         }
     }
 }
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs
deleted file mode 100644
index 8c4a3f3..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.Extend.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.IO;
-using NetModular.Module.CodeGenerator.Infrastructure.Templates.Models;
-
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost
-{
-    public partial class Startup : ITemplateHandler
-    {
-        private readonly TemplateBuildModel _model;
-        private readonly string _prefix;
-
-        public Startup(TemplateBuildModel model)
-        {
-            _model = model;
-            _prefix = model.Module.Prefix;
-        }
-
-        public bool IsGlobal => true;
-
-        public void Save()
-        {
-            var dir = Path.Combine(_model.RootPath, "src/WebHost");
-            if (!Directory.Exists(dir))
-                Directory.CreateDirectory(dir);
-
-            var content = TransformText();
-            var filePath = Path.Combine(dir, "Startup.cs");
-            File.WriteAllText(filePath, content);
-        }
-    }
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs
deleted file mode 100644
index e924a5c..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.cs
+++ /dev/null
@@ -1,331 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本: 16.0.0.0
-//  
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-// ------------------------------------------------------------------------------
-namespace NetModular.Module.CodeGenerator.Infrastructure.Templates.Default.T4.src.WebHost
-{
-    using System;
-    
-    /// <summary>
-    /// Class to produce the template output
-    /// </summary>
-    
-    #line 1 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public partial class Startup : StartupBase
-    {
-#line hidden
-        /// <summary>
-        /// Create the template output
-        /// </summary>
-        public virtual string TransformText()
-        {
-            this.Write("using Microsoft.Extensions.Configuration;\r\nusing Microsoft.Extensions.Hosting;\r\nu" +
-                    "sing ");
-            
-            #line 4 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
-            
-            #line default
-            #line hidden
-            this.Write(".Lib.Host.Web;\r\n\r\nnamespace ");
-            
-            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_prefix));
-            
-            #line default
-            #line hidden
-            this.Write(".Module.");
-            
-            #line 6 "D:\MyProject\NetModular\NetModular.Module.CodeGenerator\src\Library\Infrastructure\Templates\Default\T4\src\WebHost\Startup.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(_model.Module.Code));
-            
-            #line default
-            #line hidden
-            this.Write(".WebHost\r\n{\r\n    public class Startup : StartupAbstract\r\n    {\r\n        public St" +
-                    "artup(IHostEnvironment env, IConfiguration cfg) : base(env, cfg)\r\n        {\r\n   " +
-                    "     }\r\n    }\r\n}\r\n");
-            return this.GenerationEnvironment.ToString();
-        }
-    }
-    
-    #line default
-    #line hidden
-    #region Base class
-    /// <summary>
-    /// Base class for this transformation
-    /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
-    public class StartupBase
-    {
-        #region Fields
-        private global::System.Text.StringBuilder generationEnvironmentField;
-        private global::System.CodeDom.Compiler.CompilerErrorCollection errorsField;
-        private global::System.Collections.Generic.List<int> indentLengthsField;
-        private string currentIndentField = "";
-        private bool endsWithNewline;
-        private global::System.Collections.Generic.IDictionary<string, object> sessionField;
-        #endregion
-        #region Properties
-        /// <summary>
-        /// The string builder that generation-time code is using to assemble generated output
-        /// </summary>
-        protected System.Text.StringBuilder GenerationEnvironment
-        {
-            get
-            {
-                if ((this.generationEnvironmentField == null))
-                {
-                    this.generationEnvironmentField = new global::System.Text.StringBuilder();
-                }
-                return this.generationEnvironmentField;
-            }
-            set
-            {
-                this.generationEnvironmentField = value;
-            }
-        }
-        /// <summary>
-        /// The error collection for the generation process
-        /// </summary>
-        public System.CodeDom.Compiler.CompilerErrorCollection Errors
-        {
-            get
-            {
-                if ((this.errorsField == null))
-                {
-                    this.errorsField = new global::System.CodeDom.Compiler.CompilerErrorCollection();
-                }
-                return this.errorsField;
-            }
-        }
-        /// <summary>
-        /// A list of the lengths of each indent that was added with PushIndent
-        /// </summary>
-        private System.Collections.Generic.List<int> indentLengths
-        {
-            get
-            {
-                if ((this.indentLengthsField == null))
-                {
-                    this.indentLengthsField = new global::System.Collections.Generic.List<int>();
-                }
-                return this.indentLengthsField;
-            }
-        }
-        /// <summary>
-        /// Gets the current indent we use when adding lines to the output
-        /// </summary>
-        public string CurrentIndent
-        {
-            get
-            {
-                return this.currentIndentField;
-            }
-        }
-        /// <summary>
-        /// Current transformation session
-        /// </summary>
-        public virtual global::System.Collections.Generic.IDictionary<string, object> Session
-        {
-            get
-            {
-                return this.sessionField;
-            }
-            set
-            {
-                this.sessionField = value;
-            }
-        }
-        #endregion
-        #region Transform-time helpers
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void Write(string textToAppend)
-        {
-            if (string.IsNullOrEmpty(textToAppend))
-            {
-                return;
-            }
-            // If we're starting off, or if the previous text ended with a newline,
-            // we have to append the current indent first.
-            if (((this.GenerationEnvironment.Length == 0) 
-                        || this.endsWithNewline))
-            {
-                this.GenerationEnvironment.Append(this.currentIndentField);
-                this.endsWithNewline = false;
-            }
-            // Check if the current text ends with a newline
-            if (textToAppend.EndsWith(global::System.Environment.NewLine, global::System.StringComparison.CurrentCulture))
-            {
-                this.endsWithNewline = true;
-            }
-            // This is an optimization. If the current indent is "", then we don't have to do any
-            // of the more complex stuff further down.
-            if ((this.currentIndentField.Length == 0))
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-                return;
-            }
-            // Everywhere there is a newline in the text, add an indent after it
-            textToAppend = textToAppend.Replace(global::System.Environment.NewLine, (global::System.Environment.NewLine + this.currentIndentField));
-            // If the text ends with a newline, then we should strip off the indent added at the very end
-            // because the appropriate indent will be added when the next time Write() is called
-            if (this.endsWithNewline)
-            {
-                this.GenerationEnvironment.Append(textToAppend, 0, (textToAppend.Length - this.currentIndentField.Length));
-            }
-            else
-            {
-                this.GenerationEnvironment.Append(textToAppend);
-            }
-        }
-        /// <summary>
-        /// Write text directly into the generated output
-        /// </summary>
-        public void WriteLine(string textToAppend)
-        {
-            this.Write(textToAppend);
-            this.GenerationEnvironment.AppendLine();
-            this.endsWithNewline = true;
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void Write(string format, params object[] args)
-        {
-            this.Write(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Write formatted text directly into the generated output
-        /// </summary>
-        public void WriteLine(string format, params object[] args)
-        {
-            this.WriteLine(string.Format(global::System.Globalization.CultureInfo.CurrentCulture, format, args));
-        }
-        /// <summary>
-        /// Raise an error
-        /// </summary>
-        public void Error(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Raise a warning
-        /// </summary>
-        public void Warning(string message)
-        {
-            System.CodeDom.Compiler.CompilerError error = new global::System.CodeDom.Compiler.CompilerError();
-            error.ErrorText = message;
-            error.IsWarning = true;
-            this.Errors.Add(error);
-        }
-        /// <summary>
-        /// Increase the indent
-        /// </summary>
-        public void PushIndent(string indent)
-        {
-            if ((indent == null))
-            {
-                throw new global::System.ArgumentNullException("indent");
-            }
-            this.currentIndentField = (this.currentIndentField + indent);
-            this.indentLengths.Add(indent.Length);
-        }
-        /// <summary>
-        /// Remove the last indent that was added with PushIndent
-        /// </summary>
-        public string PopIndent()
-        {
-            string returnValue = "";
-            if ((this.indentLengths.Count > 0))
-            {
-                int indentLength = this.indentLengths[(this.indentLengths.Count - 1)];
-                this.indentLengths.RemoveAt((this.indentLengths.Count - 1));
-                if ((indentLength > 0))
-                {
-                    returnValue = this.currentIndentField.Substring((this.currentIndentField.Length - indentLength));
-                    this.currentIndentField = this.currentIndentField.Remove((this.currentIndentField.Length - indentLength));
-                }
-            }
-            return returnValue;
-        }
-        /// <summary>
-        /// Remove any indentation
-        /// </summary>
-        public void ClearIndent()
-        {
-            this.indentLengths.Clear();
-            this.currentIndentField = "";
-        }
-        #endregion
-        #region ToString Helpers
-        /// <summary>
-        /// Utility class to produce culture-oriented representation of an object as a string.
-        /// </summary>
-        public class ToStringInstanceHelper
-        {
-            private System.IFormatProvider formatProviderField  = global::System.Globalization.CultureInfo.InvariantCulture;
-            /// <summary>
-            /// Gets or sets format provider to be used by ToStringWithCulture method.
-            /// </summary>
-            public System.IFormatProvider FormatProvider
-            {
-                get
-                {
-                    return this.formatProviderField ;
-                }
-                set
-                {
-                    if ((value != null))
-                    {
-                        this.formatProviderField  = value;
-                    }
-                }
-            }
-            /// <summary>
-            /// This is called from the compile/run appdomain to convert objects within an expression block to a string
-            /// </summary>
-            public string ToStringWithCulture(object objectToConvert)
-            {
-                if ((objectToConvert == null))
-                {
-                    throw new global::System.ArgumentNullException("objectToConvert");
-                }
-                System.Type t = objectToConvert.GetType();
-                System.Reflection.MethodInfo method = t.GetMethod("ToString", new System.Type[] {
-                            typeof(System.IFormatProvider)});
-                if ((method == null))
-                {
-                    return objectToConvert.ToString();
-                }
-                else
-                {
-                    return ((string)(method.Invoke(objectToConvert, new object[] {
-                                this.formatProviderField })));
-                }
-            }
-        }
-        private ToStringInstanceHelper toStringHelperField = new ToStringInstanceHelper();
-        /// <summary>
-        /// Helper to produce culture-oriented representation of an object as a string
-        /// </summary>
-        public ToStringInstanceHelper ToStringHelper
-        {
-            get
-            {
-                return this.toStringHelperField;
-            }
-        }
-        #endregion
-    }
-    #endregion
-}
diff --git a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.tt b/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.tt
deleted file mode 100644
index 7142694..0000000
--- a/src/Library/Infrastructure/Templates/Default/T4/src/WebHost/Startup.tt
+++ /dev/null
@@ -1,14 +0,0 @@
-<#@ template language="C#" #>
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using <#= _prefix #>.Lib.Host.Web;
-
-namespace <#= _prefix #>.Module.<#= _model.Module.Code #>.WebHost
-{
-    public class Startup : StartupAbstract
-    {
-        public Startup(IHostEnvironment env, IConfiguration cfg) : base(env, cfg)
-        {
-        }
-    }
-}
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index e946d4c..0a983d1 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Auth.Web" Version="9.0.7" />
-    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="9.0.7" />
-    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="9.0.7" />
-    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Auth.Web" Version="9.0.8" />
+    <PackageReference Include="NetModular.Lib.Module.AspNetCore" Version="9.0.8" />
+    <PackageReference Include="NetModular.Lib.Utils.Mvc" Version="9.0.8" />
+    <PackageReference Include="NetModular.Lib.Validation.FluentValidation" Version="9.0.8" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/WebHost/WebHost.csproj b/src/WebHost/WebHost.csproj
index deb7550..111b96c 100644
--- a/src/WebHost/WebHost.csproj
+++ b/src/WebHost/WebHost.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <ItemGroup>
-    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="9.0.7" />
-    <PackageReference Include="NetModular.Lib.Data.MySql" Version="9.0.7" />
-    <PackageReference Include="NetModular.Lib.Data.PostgreSQL" Version="9.0.7" />
-    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="9.0.7" />
-    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="9.0.7" />
-    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="9.0.7" />
-    <PackageReference Include="NetModular.Lib.Host.Web" Version="9.0.7.1" />
-    <PackageReference Include="NetModular.Lib.OSS.Local" Version="9.0.7" />
+    <PackageReference Include="NetModular.Lib.Cache.MemoryCache" Version="9.0.8" />
+    <PackageReference Include="NetModular.Lib.Data.MySql" Version="9.0.8" />
+    <PackageReference Include="NetModular.Lib.Data.PostgreSQL" Version="9.0.8" />
+    <PackageReference Include="NetModular.Lib.Data.SQLite" Version="9.0.8" />
+    <PackageReference Include="NetModular.Lib.Data.SqlServer" Version="9.0.8" />
+    <PackageReference Include="NetModular.Lib.Excel.EPPlus" Version="9.0.8" />
+    <PackageReference Include="NetModular.Lib.Host.Web" Version="9.0.8" />
+    <PackageReference Include="NetModular.Lib.OSS.Local" Version="9.0.8" />
     <PackageReference Include="NetModular.Module.Admin.Web" Version="9.0.6" />
   </ItemGroup>
 
diff --git a/src/WebHost/_modules/02_CodeGenerator/_module.json b/src/WebHost/_modules/02_CodeGenerator/_module.json
index cba89c1..f1f0b12 100644
--- a/src/WebHost/_modules/02_CodeGenerator/_module.json
+++ b/src/WebHost/_modules/02_CodeGenerator/_module.json
@@ -1 +1 @@
-{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"9.0.1","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
+{"Id": "02","Name":"代码生成","Code":"CodeGenerator","Icon":"develop","Version":"9.0.2","Description":"NetModular Module CodeGenerator(代码生成) - WebHost"}
diff --git a/src/WebHost/appsettings.json b/src/WebHost/appsettings.json
index 2034b8d..57b8775 100644
--- a/src/WebHost/appsettings.json
+++ b/src/WebHost/appsettings.json
@@ -40,22 +40,22 @@
     //是否开启日志
     "Logging": false,
     //数据库类型 0、SqlServer 1、MySql 2、SQLite
-    "Dialect": 3,
+    "Dialect": 2,
     //数据库版本
     "Version": "",
     //数据库地址
-    "Server": "localhost",
+    "Server": "",
     //端口号
-    "Port": 5432,
+    "Port": 0,
     //用户名
-    "UserId": "postgres",
+    "UserId": "",
     //密码
-    "Password": "ftrans",
+    "Password": "",
     //是否创建数据库和表
     "CreateDatabase": true,
     //是否初始化数据
     "InitData": true,
-    "NpgsqlDatabaseName": "Nm_CodeGenerator",
+    "NpgsqlDatabaseName": "",
     //模块列表
     "Modules": [
       {