From 208cb9bedecd7895d38d2790d15c374e9be5079a Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Thu, 10 Nov 2016 16:39:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B3=BB=E7=BB=9F=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bootstrap.Admin/App_Start/DBPublisher.cs | 33 ++ Bootstrap.Admin/Bootstrap.Admin.csproj | 2 + Bootstrap.Admin/Controllers/HomeController.cs | 11 +- Bootstrap.Admin/Views/Shared/Header.cshtml | 385 +++++++++--------- Bootstrap.Admin/Web.config | 6 + .../Bootstrap.DataAccess.csproj | 1 + Bootstrap.DataAccess/ExceptionHelper.cs | 33 ++ .../Bootstrap.DataAccessTests.csproj | 1 + .../ExceptionHelperTests.cs | 20 + DatabaseScripts/InitData.sql | 4 +- DatabaseScripts/Install.sql | 34 +- 11 files changed, 330 insertions(+), 200 deletions(-) create mode 100644 Bootstrap.Admin/App_Start/DBPublisher.cs create mode 100644 Bootstrap.DataAccess/ExceptionHelper.cs create mode 100644 Bootstrap.DataAccessTests/ExceptionHelperTests.cs diff --git a/Bootstrap.Admin/App_Start/DBPublisher.cs b/Bootstrap.Admin/App_Start/DBPublisher.cs new file mode 100644 index 00000000..7ec5fde1 --- /dev/null +++ b/Bootstrap.Admin/App_Start/DBPublisher.cs @@ -0,0 +1,33 @@ +using Bootstrap.DataAccess; +using Longbow.Caching; +using Longbow.ExceptionManagement; +using Longbow.ExceptionManagement.Configuration; +using System; +using System.Collections.Specialized; +using System.Web; + +namespace Bootstrap.Admin +{ + /// + /// + /// + public class DBPublisher : IExceptionPublisher + { + /// + /// + /// + /// + /// + /// + public void Publish(Exception ex, NameValueCollection additionalInfo, ExceptionPublisherElement publisherElement) + { + if (publisherElement.Mode == PublisherMode.Off) return; + HttpContext context = HttpContext.Current; + additionalInfo["ErrorPage"] = context.Request.AppRelativeCurrentExecutionFilePath; + if (context.User != null) additionalInfo["UserId"] = context.User.Identity.Name; + additionalInfo["UserIp"] = context.Request.UserHostAddress; + ExceptionHelper.Log(ex, additionalInfo); + CacheManager.Clear(); + } + } +} \ No newline at end of file diff --git a/Bootstrap.Admin/Bootstrap.Admin.csproj b/Bootstrap.Admin/Bootstrap.Admin.csproj index 381ca403..4be1506f 100644 --- a/Bootstrap.Admin/Bootstrap.Admin.csproj +++ b/Bootstrap.Admin/Bootstrap.Admin.csproj @@ -43,6 +43,7 @@ 4 + @@ -205,6 +206,7 @@ bldver.cs + diff --git a/Bootstrap.Admin/Controllers/HomeController.cs b/Bootstrap.Admin/Controllers/HomeController.cs index d1ee31ea..5aff8b4c 100644 --- a/Bootstrap.Admin/Controllers/HomeController.cs +++ b/Bootstrap.Admin/Controllers/HomeController.cs @@ -49,6 +49,7 @@ namespace Bootstrap.Admin.Controllers { //UNDONE: 本方法有严重安全漏洞，发布前需要修正 var model = new LoginModel(); + if (string.IsNullOrEmpty(userName)) return View(model); model.UserName = userName; if (LgbPrincipal.IsAdmin(userName) || UserHelper.Authenticate(userName, password)) { @@ -72,15 +73,15 @@ namespace Bootstrap.Admin.Controllers /// /// [AllowAnonymous] - public ActionResult Register(string userName, string displayName, string password,string description) + public ActionResult Register(string userName, string displayName, string password, string description) { - var result = UserHelper.RegisterUser(userName, displayName, password,description); - if (result) + var result = UserHelper.RegisterUser(userName, displayName, password, description); + if (result) { return Redirect("/Content/html/RegResult.html"); } - - else + + else return View(); } } diff --git a/Bootstrap.Admin/Views/Shared/Header.cshtml b/Bootstrap.Admin/Views/Shared/Header.cshtml index f2edba15..c58710c4 100644 --- a/Bootstrap.Admin/Views/Shared/Header.cshtml +++ b/Bootstrap.Admin/Views/Shared/Header.cshtml @@ -21,201 +21,204 @@ } + @if (!Model.ShowMenu) + { - +
+
+ 87% Complete +
+
+ + +
  • + +
    +
    任务4
    +
    33%
    +
    +
    +
    + 33% Complete (danger) +
    +
    +     +
    • +
  • + +
    +
    任务5
    +
    45%
    +
    +
    +
    + 45% Complete +
    +
    +     +
    • +
  • + 查看所有任务 +
    • + + + + + + + + + + + }
    • @@ -231,9 +234,9 @@
      • diff --git a/Bootstrap.Admin/Web.config b/Bootstrap.Admin/Web.config index aa97430f..72034dd5 100644 --- a/Bootstrap.Admin/Web.config +++ b/Bootstrap.Admin/Web.config @@ -5,6 +5,7 @@ --> +
      @@ -47,6 +48,11 @@ + + + + + diff --git a/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj b/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj index 3b9f02cf..eed9ec65 100644 --- a/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj +++ b/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj @@ -60,6 +60,7 @@ + diff --git a/Bootstrap.DataAccess/ExceptionHelper.cs b/Bootstrap.DataAccess/ExceptionHelper.cs new file mode 100644 index 00000000..ecd4b697 --- /dev/null +++ b/Bootstrap.DataAccess/ExceptionHelper.cs @@ -0,0 +1,33 @@ +using Longbow.Data; +using System; +using System.Collections.Specialized; +using System.Data; +using System.Data.Common; + +namespace Bootstrap.DataAccess +{ + public static class ExceptionHelper + { + public static void Log(Exception ex, NameValueCollection additionalInfo) + { + try + { + var sql = "insert into Exceptions (AppDomainName, ErrorPage, UserID, UserIp, Message, StackTrace, LogTime) values (@AppDomainName, @ErrorPage, @UserID, @UserIp, @Message, @StackTrace, GetDate())"; + using (DbCommand cmd = DBAccessManager.SqlDBAccess.CreateCommand(CommandType.Text, sql)) + { + cmd.Parameters.Add(DBAccessManager.SqlDBAccess.CreateParameter("@AppDomainName", AppDomain.CurrentDomain.FriendlyName, ParameterDirection.Input)); + cmd.Parameters.Add(DBAccessManager.SqlDBAccess.CreateParameter("@ErrorPage", additionalInfo["ErrorPage"], ParameterDirection.Input)); + cmd.Parameters.Add(DBAccessManager.SqlDBAccess.CreateParameter("@UserID", DBAccess.ToDBValue(additionalInfo["UserId"]), ParameterDirection.Input)); + cmd.Parameters.Add(DBAccessManager.SqlDBAccess.CreateParameter("@UserIp", additionalInfo["UserIp"], ParameterDirection.Input)); + cmd.Parameters.Add(DBAccessManager.SqlDBAccess.CreateParameter("@Message", ex.Message, ParameterDirection.Input)); + cmd.Parameters.Add(DBAccessManager.SqlDBAccess.CreateParameter("@StackTrace", DBAccess.ToDBValue(ex.StackTrace), ParameterDirection.Input)); + DBAccessManager.SqlDBAccess.ExecuteNonQuery(cmd); + } + } + catch + { + throw new Exception("Excetion Log Error"); + } + } + } +} diff --git a/Bootstrap.DataAccessTests/Bootstrap.DataAccessTests.csproj b/Bootstrap.DataAccessTests/Bootstrap.DataAccessTests.csproj index d623012a..b966d482 100644 --- a/Bootstrap.DataAccessTests/Bootstrap.DataAccessTests.csproj +++ b/Bootstrap.DataAccessTests/Bootstrap.DataAccessTests.csproj @@ -55,6 +55,7 @@ + diff --git a/Bootstrap.DataAccessTests/ExceptionHelperTests.cs b/Bootstrap.DataAccessTests/ExceptionHelperTests.cs new file mode 100644 index 00000000..722648c1 --- /dev/null +++ b/Bootstrap.DataAccessTests/ExceptionHelperTests.cs @@ -0,0 +1,20 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Specialized; + +namespace Bootstrap.DataAccess.Tests +{ + [TestClass()] + public class ExceptionHelperTests + { + [TestMethod()] + public void LogTest() + { + var ex = new Exception("Just for Test"); + var nv = new NameValueCollection(); + nv.Add("ErrorPage", "UnitTest_Page"); + nv.Add("UserIp", "::1"); + ExceptionHelper.Log(ex, nv); + } + } +} \ No newline at end of file diff --git a/DatabaseScripts/InitData.sql b/DatabaseScripts/InitData.sql index 41002be0..8b3d908f 100644 --- a/DatabaseScripts/InitData.sql +++ b/DatabaseScripts/InitData.sql @@ -6,7 +6,7 @@ SET IDENTITY_INSERT [dbo].[Users] ON insert into Users (ID, UserName, Password, PassSalt, DisplayName, RegisterTime, ApprovedTime, [Description]) values (1, 'Admin', 'Es7WVgNsJuELwWK8daCqufUBknCsSC0IYDphQZAiGOo=', 'W5vpBEOYRGHkQXatN0t+ECM/U8cHDuEgrq56+zZBk4J481xH', 'Administrator', GetDate(), GetDate(), N'系统默认创建') SET IDENTITY_INSERT [dbo].[Users] OFF -DELETE From Dicts where ID < 10 +DELETE From Dicts where ID < 12 SET IDENTITY_INSERT [dbo].[Dicts] ON INSERT [dbo].[Dicts] ([ID], [Category], [Name], [Code], [Define]) VALUES (1, N'菜单', N'系统菜单', N'0', 0) INSERT [dbo].[Dicts] ([ID], [Category], [Name], [Code], [Define]) VALUES (2, N'菜单', N'外部菜单', N'1', 0) @@ -77,4 +77,6 @@ INSERT [dbo].[NavigationRole] ([ID], [NavigationID], [RoleID]) VALUES (12, 11, 2 INSERT [dbo].[NavigationRole] ([ID], [NavigationID], [RoleID]) VALUES (13, 12, 1) INSERT [dbo].[NavigationRole] ([ID], [NavigationID], [RoleID]) VALUES (14, 13, 2) INSERT [dbo].[NavigationRole] ([ID], [NavigationID], [RoleID]) VALUES (15, 14, 2) +INSERT [dbo].[NavigationRole] ([ID], [NavigationID], [RoleID]) VALUES (16, 1, 2) +INSERT [dbo].[NavigationRole] ([ID], [NavigationID], [RoleID]) VALUES (17, 10, 2) SET IDENTITY_INSERT [dbo].[NavigationRole] OFF \ No newline at end of file diff --git a/DatabaseScripts/Install.sql b/DatabaseScripts/Install.sql index b4b84889..997050a6 100644 --- a/DatabaseScripts/Install.sql +++ b/DatabaseScripts/Install.sql @@ -136,7 +136,7 @@ GO SET QUOTED_IDENTIFIER ON GO CREATE TABLE [dbo].[Notifications]( - [ID] [int] NOT NULL, + [ID] [int] IDENTITY(1,1) NOT NULL, [Category] [nvarchar](50) NOT NULL, [Title] [nvarchar](50) NOT NULL, [Content] [nvarchar](50) NOT NULL, @@ -144,7 +144,11 @@ CREATE TABLE [dbo].[Notifications]( [ProcessTime] [datetime] NULL, [ProcessBy] [nvarchar](50) NULL, [ProcessResult] [nvarchar](50) NULL, - [Status] [nvarchar](50) NOT NULL + [Status] [nvarchar](50) NOT NULL, + CONSTRAINT [PK_Notifications] PRIMARY KEY CLUSTERED +( + [ID] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] ) ON [PRIMARY] GO EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'0 标示未处理 1 标示已处理' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Notifications', @level2type=N'COLUMN',@level2name=N'Status' @@ -235,7 +239,31 @@ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'部门名称' GO EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'描述' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Groups', @level2type=N'COLUMN',@level2name=N'Description' GO -/****** Object: Table [dbo].[Dicts] Script Date: 11/10/2016 11:32:54 ******/ +/****** Object: Table [dbo].[Exceptions] Script Date: 11/10/2016 16:30:56 ******/ +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO +SET ANSI_PADDING ON +GO +CREATE TABLE [dbo].[Exceptions]( + [ID] [int] IDENTITY(1,1) NOT NULL, + [AppDomainName] [varchar](50) NOT NULL, + [ErrorPage] [varchar](50) NOT NULL, + [UserID] [varchar](50) NULL, + [UserIp] [varchar](15) NOT NULL, + [Message] [nvarchar](max) NOT NULL, + [StackTrace] [nvarchar](max) NULL, + [LogTime] [datetime] NOT NULL, + CONSTRAINT [PK_Exceptions] PRIMARY KEY CLUSTERED +( + [ID] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO +SET ANSI_PADDING OFF +GO +/****** Object: Table [dbo].[Dicts] Script Date: 11/10/2016 16:30:56 ******/ SET ANSI_NULLS ON GO SET QUOTED_IDENTIFIER ON