Merge branch 'master' into dev

Author: myloveCc

.gitattributes

@@ -61,3 +61,9 @@
 #*.PDF   diff=astextplain
 #*.rtf   diff=astextplain
 #*.RTF   diff=astextplain
+
+
+
+*.js linguist-language=C#
+*.css linguist-language=C#
+*.html linguist-language=C#

License

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 雨~
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

NETCore.DapperKit.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.13
+VisualStudioVersion = 15.0.26430.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{424ABC0A-A295-498F-BC1D-BBF3EDA7ACC7}"
 EndProject
@@ -17,6 +17,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NETCore.DapperKit.Tests", "
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{813A8C5B-8457-469F-BC69-94198C570898}"
 	ProjectSection(SolutionItems) = preProject
+		.gitattributes = .gitattributes
 		README.md = README.md
 	EndProjectSection
 EndProject

README.md

@@ -1,2 +1,80 @@
 # NETCore.DapperKit
-Dapper extensions
+
+## Easy use [Dapper](https://github.com/StackExchange/Dapper) like ef with DapperKit.
+
+
+---
+
+# Install with nuget
+
+- To install NETCore.DapperKit, run the following command in the [Package Manager](https://docs.microsoft.com/zh-cn/nuget/tools/package-manager-console) Console
+
+```
+Install-Package NETCore.DapperKit -Version 2.0.0
+```
+
+# Add Dapperkit service in starup.cs
+
+- Using DapperKit extensions
+
+```csharp
+using NETCore.DapperKit.Extensions;
+```
+
+- Add Dapperkit service
+
+```csharp
+ public void ConfigureServices(IServiceCollection services)
+      {
+          // Add framework services.
+          services.AddMvc();
+
+          // Add DapperKit
+          services.AddDapperKit(optionsBuilder =>
+          {
+              optionsBuilder.UseDapper(new DapperKitOptions()
+              {
+                  ConnectionString = "Data Source=.;User ID=sa;Password='123456';Initial Catalog=DapperDb;MultipleActiveResultSets=True;"
+              });
+          });
+      }
+
+```
+
+# User DapperKit in asp.net core mvc controller
+
+- Init DapperContext
+```csharp
+public class AccountController : Controller
+{
+
+    private readonly IDapperContext _DapperContext;
+
+    public AccountController(IDapperContext context)
+    {
+        _DapperContext = context;
+    }
+    ...
+}
+```
+
+- Use Dapper Like EF
+
+```csharp
+public async Task<IActionResult> Login(LoginViewModel model, string returnUrl = null)
+{
+    ...
+    var users = await _DapperContext.DbSet<SysUser>()
+                                    .Select<SysUserRole>((u, r) => new SysUser() { Id = u.Id, IsAdmin = u.IsAdmin, LoginName = u.LoginName, LoginPwd = u.LoginPwd, CreateTime = u.CreateTime, UserName = u.UserName, UserRoleNo = u.UserRoleNo, RoleName = r.Name })
+                                    .Join<SysUserRole>((u, r) => u.UserRoleNo == r.No)
+                                    .Where(m => m.LoginName == model.Account && m.LoginPwd == model.Password)
+                                    .ToListAsync<SysUser>();
+    ...                                 
+}
+```
+
+# LICENSE
+
+[MIT LICESE](https://github.com/myloveCc/NETCore.DapperKit/blob/master/License)
+
+

example/NETCore.DapperKit.Web/Controllers/AccountController.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using NETCore.DapperKit.Web.ViewModels;
+using NETCore.DapperKit.Web.Model;
+
+// For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
+
+namespace NETCore.DapperKit.Web.Controllers
+{
+    public class AccountController : Controller
+    {
+
+        private readonly IDapperContext _DapperContext;
+
+        public AccountController(IDapperContext context)
+        {
+            _DapperContext = context;
+        }
+
+        // GET: /<controller>/
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 登录方法
+        /// </summary>
+        /// <param name="model">UserViewModel实体信息</param>
+        /// <param name="returnUrl">返回Url地址</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> Login(LoginViewModel model, string returnUrl = null)
+        {
+            ViewData["ReturnUrl"] = returnUrl;
+            if (!ModelState.IsValid) return View(model);
+
+            try
+            {
+                var users = await _DapperContext.DbSet<SysUser>()
+                                        .Select<SysUserRole>((u, r) => new SysUser() { Id = u.Id, IsAdmin = u.IsAdmin, LoginName = u.LoginName, LoginPwd = u.LoginPwd, CreateTime = u.CreateTime, UserName = u.UserName, UserRoleNo = u.UserRoleNo, RoleName = r.Name })
+                                        .Join<SysUserRole>((u, r) => u.UserRoleNo == r.No)
+                                        .Where(m => m.LoginName == model.Account && m.LoginPwd == model.Password)
+                                        .ToListAsync<SysUser>();
+
+
+                if (users != null && users.First().LoginName == model.Account)
+                {
+                    return RedirectToAction("Index", "Home");
+                }
+            }
+            catch (Exception ex)
+            {
+
+            }
+
+            return RedirectToAction("Index");
+        }
+
+    }
+}

example/NETCore.DapperKit.Web/Controllers/HomeController.cs

@@ -18,23 +18,13 @@ public HomeController(IDapperRepository dapperRepository)
 
         public IActionResult Index()
         {
-            var model = new DapperKitModel()
-            {
-                Account = "dswq42",
-                Password = "123456"
-            };
-
-            var result = _DapperRepository.Insert(model);
-
             return View();
         }
 
         public async Task<IActionResult> About()
         {
             ViewData["Message"] = "Your application description page.";
 
-            var result = await _DapperRepository.GetAllAsync<DapperKitModel>();
-
             return View();
         }
 

example/NETCore.DapperKit.Web/Model/DapperKitModel.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NETCore.DapperKit.Extensions;
+
+namespace NETCore.DapperKit.Web.Model
+{
+    [Table("SysUser")]
+    public class SysUser
+    {
+        /// <summary>
+        /// primary key 
+        /// </summary>\
+        [Key]
+        public int Id { get; set; }
+        /// <summary>
+        /// account
+        /// </summary>
+        public string LoginName { get; set; }
+        /// <summary>
+        /// password
+        /// </summary>
+        public string LoginPwd { get; set; }
+
+        public string UserName { get; set; }
+
+        public string UserRoleNo { get; set; }
+
+        public bool IsAdmin { get; set; }
+
+        public DateTime CreateTime { get; set; }
+
+        [Write(false)]
+        public string RoleName { get; set; }
+    }
+}

example/NETCore.DapperKit.Web/Model/SysUser.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace NETCore.DapperKit.Web.Model
+{
+    public class SysUserGroup
+    {
+        public int UserCount { get; set; }
+
+        public string Role { get; set; }
+    }
+}

example/NETCore.DapperKit.Web/Model/SysUserGroup.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NETCore.DapperKit.Extensions;
+
+namespace NETCore.DapperKit.Web.Model
+{
+    [Table("SysUserRole")]
+    public class SysUserRole
+    {
+        [Key]
+        public string No { get; set; }
+
+        public string Name { get; set; }
+    }
+}