From c14dd0c169c8abc94a85092a7006c2529796e299 Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Mon, 11 Mar 2019 09:59:06 +0800
Subject: [PATCH] update & test

---
 Examples/repository_01/Startup.cs | 79 +++++--------------------------
 readme.md                         |  4 +-
 2 files changed, 15 insertions(+), 68 deletions(-)

diff --git a/Examples/repository_01/Startup.cs b/Examples/repository_01/Startup.cs
index db53c365..da0c513f 100644
--- a/Examples/repository_01/Startup.cs
+++ b/Examples/repository_01/Startup.cs
@@ -9,80 +9,25 @@ using Microsoft.Extensions.Logging;
 using restful.Entitys;
 using Swashbuckle.AspNetCore.Swagger;
 using System;
+using System.Diagnostics;
 using System.Text;
 
 namespace repository_01 {
 
-	public interface IBaseModel<TKey> {
-
-		TKey Id { get; set; }
-	}
-
 	/// <summary>
 	/// 用户密码信息
 	/// </summary>
-	public class SysUserLogOn : IBaseModel<Guid> {
-		[Column(IsPrimary = true)]
-		public Guid Id { get; set; } = Guid.NewGuid();
-
-		public Guid SysUserId { get; set; }
-
-		public string UserPassword { get; set; }
-		[Column(DbType = "varchar(100)")]
-		public string UserSecretkey { get; set; }
-		public DateTime PreviousVisitTime { get; set; } = DateTime.Now;
-		public DateTime LastVisitTime { get; set; } = DateTime.Now;
-		public int LogOnCount { get; set; }
-
-
-		public virtual SysUser SysUser { get; set; }
+	public class SysUserLogOn {
+		[Column(IsPrimary = true, Name = "Id")]
+		public Guid UserLogOnId { get; set; }
+		public virtual SysUser User { get; set; }
 	}
-	public class SysUser : IBaseModel<Guid> {
-		[Column(IsPrimary = true)]
-		public Guid Id { get; set; } = Guid.NewGuid();
-
-		[Column(DbType = "varchar(50)")]
-		public string AccountName { get; set; }
-		[Column(DbType = "varchar(50)")]
-		public string Name { get; set; }
-		public string HeadIcon { get; set; }
-		public Gender Gender { get; set; } = Gender.Man;
-		public DateTime Birthday { get; set; } = DateTime.MinValue;
-		[Column(DbType = "varchar(100)")]
-		public string MobilePhone { get; set; }
-		public string Email { get; set; }
-		public string WeChat { get; set; }
-		public string Description { get; set; }
-		public DateTime CreationTime { get; set; } = DateTime.Now;
-		public Guid? CreateUserId { get; set; }
-		public DateTime LastModifyTime { get; set; } = DateTime.Now;
-		public Guid? LastModifyUserId { get; set; }
-
-
-
-
-		public AccountState State { get; set; } = AccountState.Normal;
-
-	}
-	public enum Gender {
-		Man = 1,
-		Woman = 2,
-	}
-
-	public enum AccountState {
-		/// <summary>
-		/// 正常
-		/// </summary>
-		Normal = 1,
-		/// <summary>
-		/// 被禁用
-		/// </summary>
-		Disabled = 2,
-		/// <summary>
-		/// 已注销
-		/// </summary>
-		Closed = 3
+	public class SysUser {
+		[Column(IsPrimary = true, Name = "Id")]
+		public Guid UserId { get; set; }
+		public virtual SysUserLogOn UserLogOn { get; set; }
 	}
+	
 	public class Startup {
 		public Startup(IConfiguration configuration, ILoggerFactory loggerFactory) {
 			Configuration = configuration;
@@ -92,11 +37,13 @@ namespace repository_01 {
 				.UseLogger(loggerFactory.CreateLogger<IFreeSql>())
 				.UseAutoSyncStructure(true)
 				.UseLazyLoading(true)
+
+				.UseMonitorCommand(cmd => Trace.WriteLine(cmd.CommandText))
 				.Build();
 
 			var sysu = new SysUser { };
 			Fsql.Insert<SysUser>().AppendData(sysu).ExecuteAffrows();
-			Fsql.Insert<SysUserLogOn>().AppendData(new SysUserLogOn { SysUserId = sysu.Id }).ExecuteAffrows();
+			Fsql.Insert<SysUserLogOn>().AppendData(new SysUserLogOn { UserLogOnId = sysu.UserId }).ExecuteAffrows();
 			var a = Fsql.Select<SysUserLogOn>().ToList();
 			var b = Fsql.Select<SysUserLogOn>().Any();
 		}
diff --git a/readme.md b/readme.md
index a8db7c96..358e1431 100644
--- a/readme.md
+++ b/readme.md
@@ -1,9 +1,9 @@
-FreeSql是一个功能强大的NETStandard库，用于对象关系映射程序(O/RM)，以便于开发人员能够使用 .NETStandard 对象来处理数据库，不必经常编写大部分数据访问代码。
+FreeSql 是一个功能强大的 .NETStandard 库，用于对象关系映射程序(O/RM)，便于开发人员能够使用 .NETStandard 对象来处理数据库，不必经常编写大部分数据访问代码。支持 .NETCore 2.1+ 或 .NETFramework 4.6.1+。
 
 | Package Name |  NuGet | Downloads | |
 |--------------|  ------- |  ---- | -- |
 | FreeSql | [![nuget](https://img.shields.io/nuget/v/FreeSql.svg?style=flat-square)](https://www.nuget.org/packages/FreeSql) | [![stats](https://img.shields.io/nuget/dt/FreeSql.svg?style=flat-square)](https://www.nuget.org/stats/packages/FreeSql?groupby=Version) |
-| FreeSql.Repository | [![nuget](https://img.shields.io/nuget/v/FreeSql.Repository.svg?style=flat-square)](https://www.nuget.org/packages/FreeSql.Repository) | [![stats](https://img.shields.io/nuget/dt/FreeSql.Repository.svg?style=flat-square)](https://www.nuget.org/stats/packages/FreeSql.Repository?groupby=Version) | [Wiki](https://github.com/2881099/FreeSql/wiki/Repository) |
+| [FreeSql.Repository](https://github.com/2881099/FreeSql/wiki/Repository) | [![nuget](https://img.shields.io/nuget/v/FreeSql.Repository.svg?style=flat-square)](https://www.nuget.org/packages/FreeSql.Repository) | [![stats](https://img.shields.io/nuget/dt/FreeSql.Repository.svg?style=flat-square)](https://www.nuget.org/stats/packages/FreeSql.Repository?groupby=Version) |
 
 ## 特性