area 改造完成 2.0

yuzd · yuzd · commit 50d79320d68d · 2019-07-05T14:02:56.000+08:00
diff --git a/ant.mgr/DBModels/DBModels/mysql初始化表.sql b/ant.mgr/DBModels/DBModels/mysql初始化表.sql
@@ -72,19 +72,22 @@ insert into `system_menu` (`Tid`,`DataChangeLastTime`, `IsActive`, `ParentTid`,
  
 insert into `system_menu` (`DataChangeLastTime`, `IsActive`, `ParentTid`, `Name`, `Ico`, `Url`, `OrderRule`, `Level`, `Class`)
  values
- (now(),'1','1','菜单管理',NULL,'~/Admin/Home/MenuList','1','2',NULL);
+ (now(),'1','1','菜单管理',NULL,'~/Admin/Home/MenuList','1','2','fa fa-reorder');
  
  insert into `system_menu` (`DataChangeLastTime`, `IsActive`, `ParentTid`, `Name`, `Ico`, `Url`, `OrderRule`, `Level`, `Class`)
- values(now(),'1','1','权限配置',NULL,'~/Admin/Role/RoleAction','2','2',NULL);
+ values(now(),'1','1','权限配置',NULL,'~/Admin/Role/RoleAction','2','2','fa fa-shield');
  
 insert into `system_menu` (`DataChangeLastTime`, `IsActive`, `ParentTid`, `Name`, `Ico`, `Url`, `OrderRule`, `Level`, `Class`)
- values(now(),'1','1','角色管理',NULL,'~/Admin/Role/RoleList','3','2',NULL);
+ values(now(),'1','1','角色管理',NULL,'~/Admin/Role/RoleList','3','2','fa fa-th-large');
  
 insert into `system_menu` (`DataChangeLastTime`, `IsActive`, `ParentTid`, `Name`, `Ico`, `Url`, `OrderRule`, `Level`, `Class`) 
- values(now(),'1','1','系统用户',NULL,'~/Admin/Account/UserList','4','2',NULL);
+ values(now(),'1','1','系统用户',NULL,'~/Admin/Account/UserList','4','2','fa fa-users');
  
+insert into `system_menu` (`DataChangeLastTime`, `IsActive`, `ParentTid`, `Name`, `Ico`, `Url`, `OrderRule`, `Level`, `Class`) 
+ values(now(),'0','1','用户信息',NULL,'~/Admin/Account/UserDetail','5','2','fa fa-user-plus');
+
 insert into `system_menu` (`DataChangeLastTime`, `IsActive`, `ParentTid`, `Name`, `Ico`, `Url`, `OrderRule`, `Level`, `Class`)
- values(now(),'1','1','代码生成',NULL,'~/Admin/Common/CodeGen','5','2',NULL);
+ values(now(),'1','1','代码生成',NULL,'~/Admin/Common/CodeGen','6','2','fa fa-clone');
 
 INSERT INTO `system_users` 
 (`DataChangeLastTime`, `IsActive`, `Eid`, `UserName`, `Pwd`, `Phone`, `LoginIp`, `MenuRights`, `RoleTid`, `LastLoginTime`, `UserAgent`, `CreateRoleName`, `CreateUser`) 
diff --git a/ant.mgr/DBModels/DBModels/sqlserver2012初始化.sql b/ant.mgr/DBModels/DBModels/sqlserver2012初始化.sql
diff --git a/ant.mgr/mgr.core/Controllers/HomeController.cs b/ant.mgr/mgr.core/Controllers/HomeController.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 
-namespace ant.mgr.core.Controller
+namespace ant.mgr.core.Controllers
 {
     public class HomeController : ControllerBase
     {
@@ -20,7 +20,7 @@ public IActionResult Index()
 
         public ActionResult DashBord()
         {
-            return Content("DashBord");
+            return Content($"Version：{ typeof(Startup).Assembly.GetName().Version.ToString()}");
         }
     }
 }
diff --git a/ant.mgr/mgr.core/Properties/launchSettings.json b/ant.mgr/mgr.core/Properties/launchSettings.json
@@ -20,14 +20,6 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "IIS": {
-      "commandName": "IIS",
-      "launchBrowser": true,
-      "launchUrl": "http://localhost/ant.mgr.core",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "console": {
       "commandName": "Project",
       "launchBrowser": true,
diff --git a/ant.mgr/mgr.core/Web.config b/ant.mgr/mgr.core/Web.config
@@ -2,7 +2,7 @@
 <configuration>
   <system.webServer>
     <handlers>
-      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
     </handlers>
     <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout">
       <environmentVariables />
diff --git a/ant.mgr/mgr.core/ant.mgr.core.csproj b/ant.mgr/mgr.core/ant.mgr.core.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Version>2.0</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -50,7 +51,9 @@
     <None Include="wwwroot\Content\static\images\joinbottom.gif" />
     <None Include="wwwroot\Content\static\images\jzx.gif" />
   </ItemGroup>
-
+  <PropertyGroup>
+    <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
+  </PropertyGroup>
   <ItemGroup>
     <Content Update="appsettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Threading.Tasks;`
`5`	`5`	`using Microsoft.AspNetCore.Mvc;`
`6`	`6`
`7`		`-namespace ant.mgr.core.Controller`
	`7`	`+namespace ant.mgr.core.Controllers`
`8`	`8`	`{`
`9`	`9`	`public class HomeController : ControllerBase`
`10`	`10`	`{`
`@@ -20,7 +20,7 @@ public IActionResult Index()`
`20`	`20`
`21`	`21`	`public ActionResult DashBord()`
`22`	`22`	`{`
`23`		`- return Content("DashBord");`
	`23`	`+ return Content($"Version：{ typeof(Startup).Assembly.GetName().Version.ToString()}");`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`}`