每一次都是大放血

2025-11-07 18:04:45 +08:00 · 2017-11-29 20:49:14 +08:00
parent e36664d5f6
commit b7a72f62c0
80 changed files with 12919 additions and 12884 deletions
--- a/OpenAuth.Repository/BaseRepository.cs
+++ b/OpenAuth.Repository/BaseRepository.cs
@@ -5,10 +5,8 @@ using System.Data.Entity.Validation;
 using System.Linq;
 using System.Linq.Expressions;
 using EntityFramework.Extensions;
-using OpenAuth.Domain.Interface;
 using Infrastructure;
-using OpenAuth.Domain;
-using OpenAuth.Repository.Models;
+using OpenAuth.Repository.Interface;

 namespace OpenAuth.Repository
 {
--- a/OpenAuth.Repository/Domain/Application.cs
+++ b/OpenAuth.Repository/Domain/Application.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 应用
--- a/OpenAuth.Repository/Domain/Category.cs
+++ b/OpenAuth.Repository/Domain/Category.cs
@@ -11,52 +11,46 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
-	/// 分类表
+	/// 分类表，表示一个全集，比如：男、女、未知。关联的分类类型表示按什么进行的分类，如：按照性别对人类对象集进行分类
 	/// </summary>
    public partial class Category : Entity
    {
        public Category()
        {
-          this.CascadeId= string.Empty;
          this.Name= string.Empty;
-          this.Code= string.Empty;
-          this.Status= 0;
          this.SortNo= 0;
+          this.Icon= string.Empty;
+          this.Description= string.Empty;
          this.TypeId= string.Empty;
-          this.ParentId= string.Empty;
        }

-        /// <summary>
-	    /// 节点语义ID
-	    /// </summary>
-        public string CascadeId { get; set; }
        /// <summary>
 	    /// 名称
 	    /// </summary>
        public string Name { get; set; }
        /// <summary>
-	    /// 编号
+	    /// 是否可用
 	    /// </summary>
-        public string Code { get; set; }
-        /// <summary>
-	    /// 当前状态
-	    /// </summary>
-        public int Status { get; set; }
+        public bool Disabled { get; set; }
        /// <summary>
 	    /// 排序号
 	    /// </summary>
        public int SortNo { get; set; }
        /// <summary>
-	    /// 分类所属科目
+	    /// 分类图标
+	    /// </summary>
+        public string Icon { get; set; }
+        /// <summary>
+	    /// 分类描述
+	    /// </summary>
+        public string Description { get; set; }
+        /// <summary>
+	    /// 分类类型ID
 	    /// </summary>
        public string TypeId { get; set; }
-        /// <summary>
-	    /// 父节点流水号
-	    /// </summary>
-        public string ParentId { get; set; }

    }
 }
--- a/OpenAuth.Repository/Domain/CategoryType.cs
+++ b/OpenAuth.Repository/Domain/CategoryType.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 分类类型
@@ -21,9 +21,7 @@ namespace OpenAuth.Domain
        public CategoryType()
        {
          this.Name= string.Empty;
-          this.Code= string.Empty;
          this.CreateTime= DateTime.Now;
-          this.CreateUser= string.Empty;
        }

        /// <summary>
@@ -31,17 +29,9 @@ namespace OpenAuth.Domain
 	    /// </summary>
        public string Name { get; set; }
        /// <summary>
-	    /// 编码
+	    /// 创建时间
 	    /// </summary>
-        public string Code { get; set; }
-        /// <summary>
-	    /// 创建日期
-	    /// </summary>
-        public System.DateTime? CreateTime { get; set; }
-        /// <summary>
-	    /// 创建人
-	    /// </summary>
-        public string CreateUser { get; set; }
+        public System.DateTime CreateTime { get; set; }

    }
 }
--- a/OpenAuth.Repository/Domain/Entity.cs
+++ b/OpenAuth.Repository/Domain/Entity.cs
@@ -1,6 +1,6 @@
 using System;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    public abstract class Entity
    {
--- a/OpenAuth.Repository/Domain/Module.cs
+++ b/OpenAuth.Repository/Domain/Module.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 功能模块表
--- a/OpenAuth.Repository/Domain/ModuleElement.cs
+++ b/OpenAuth.Repository/Domain/ModuleElement.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 模块元素表(需要权限控制的按钮)
@@ -22,7 +22,6 @@ namespace OpenAuth.Domain
        {
          this.DomId= string.Empty;
          this.Name= string.Empty;
-          this.Type= string.Empty;
          this.Attr= string.Empty;
          this.Script= string.Empty;
          this.Icon= string.Empty;
@@ -30,6 +29,8 @@ namespace OpenAuth.Domain
          this.Remark= string.Empty;
          this.Sort= 0;
          this.ModuleId= string.Empty;
+          this.TypeName= string.Empty;
+          this.TypeId= string.Empty;
        }

        /// <summary>
@@ -40,10 +41,6 @@ namespace OpenAuth.Domain
 	    /// 名称
 	    /// </summary>
        public string Name { get; set; }
-        /// <summary>
-	    /// 类型
-	    /// </summary>
-        public string Type { get; set; }
        /// <summary>
 	    /// 元素附加属性
 	    /// </summary>
@@ -72,6 +69,14 @@ namespace OpenAuth.Domain
 	    /// 功能模块Id
 	    /// </summary>
        public string ModuleId { get; set; }
+        /// <summary>
+	    /// 分类名称
+	    /// </summary>
+        public string TypeName { get; set; }
+        /// <summary>
+	    /// 分类ID
+	    /// </summary>
+        public string TypeId { get; set; }

    }
 }
--- a/OpenAuth.Repository/Domain/Org.cs
+++ b/OpenAuth.Repository/Domain/Org.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 组织表
@@ -26,13 +26,14 @@ namespace OpenAuth.Domain
          this.ParentName= string.Empty;
          this.IconName= string.Empty;
          this.Status= 0;
-          this.Type= 0;
          this.BizCode= string.Empty;
          this.CustomCode= string.Empty;
          this.CreateTime= DateTime.Now;
          this.CreateId= 0;
          this.SortNo= 0;
          this.ParentId= string.Empty;
+          this.TypeName= string.Empty;
+          this.TypeId= string.Empty;
        }

        /// <summary>
@@ -67,10 +68,6 @@ namespace OpenAuth.Domain
 	    /// 当前状态
 	    /// </summary>
        public int Status { get; set; }
-        /// <summary>
-	    /// 组织类型
-	    /// </summary>
-        public int Type { get; set; }
        /// <summary>
 	    /// 业务对照码
 	    /// </summary>
@@ -95,6 +92,14 @@ namespace OpenAuth.Domain
 	    /// 父节点流水号
 	    /// </summary>
        public string ParentId { get; set; }
+        /// <summary>
+	    /// 分类名称
+	    /// </summary>
+        public string TypeName { get; set; }
+        /// <summary>
+	    /// 分类ID
+	    /// </summary>
+        public string TypeId { get; set; }

    }
 }
--- a/OpenAuth.Repository/Domain/Relevance.cs
+++ b/OpenAuth.Repository/Domain/Relevance.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 多对多关系集中映射
--- a/OpenAuth.Repository/Domain/Resource.cs
+++ b/OpenAuth.Repository/Domain/Resource.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 资源表
@@ -27,8 +27,9 @@ namespace OpenAuth.Domain
          this.SortNo= 0;
          this.Description= string.Empty;
          this.ParentId= string.Empty;
-          this.CategoryId= string.Empty;
          this.AppId= string.Empty;
+          this.TypeName= string.Empty;
+          this.TypeId= string.Empty;
        }

        /// <summary>
@@ -59,14 +60,18 @@ namespace OpenAuth.Domain
 	    /// 父节点流水号
 	    /// </summary>
        public string ParentId { get; set; }
-        /// <summary>
-	    /// 资源分类
-	    /// </summary>
-        public string CategoryId { get; set; }
        /// <summary>
 	    /// 资源所属应用
 	    /// </summary>
        public string AppId { get; set; }
+        /// <summary>
+	    /// 分类名称
+	    /// </summary>
+        public string TypeName { get; set; }
+        /// <summary>
+	    /// 分类ID
+	    /// </summary>
+        public string TypeId { get; set; }

    }
 }
--- a/OpenAuth.Repository/Domain/Role.cs
+++ b/OpenAuth.Repository/Domain/Role.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 角色表
@@ -22,9 +22,10 @@ namespace OpenAuth.Domain
        {
          this.Name= string.Empty;
          this.Status= 0;
-          this.Type= 0;
          this.CreateTime= DateTime.Now;
          this.CreateId= string.Empty;
+          this.TypeName= string.Empty;
+          this.TypeId= string.Empty;
        }

        /// <summary>
@@ -35,10 +36,6 @@ namespace OpenAuth.Domain
 	    /// 当前状态
 	    /// </summary>
        public int Status { get; set; }
-        /// <summary>
-	    /// 角色类型
-	    /// </summary>
-        public int Type { get; set; }
        /// <summary>
 	    /// 创建时间
 	    /// </summary>
@@ -47,6 +44,14 @@ namespace OpenAuth.Domain
 	    /// 创建人ID
 	    /// </summary>
        public string CreateId { get; set; }
+        /// <summary>
+	    /// 分类名称
+	    /// </summary>
+        public string TypeName { get; set; }
+        /// <summary>
+	    /// 分类ID
+	    /// </summary>
+        public string TypeId { get; set; }

    }
 }
--- a/OpenAuth.Repository/Domain/Stock.cs
+++ b/OpenAuth.Repository/Domain/Stock.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 出入库信息表
--- a/OpenAuth.Repository/Domain/User.cs
+++ b/OpenAuth.Repository/Domain/User.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 用户基本信息表
@@ -25,10 +25,11 @@ namespace OpenAuth.Domain
          this.Name= string.Empty;
          this.Sex= 0;
          this.Status= 0;
-          this.Type= 0;
          this.BizCode= string.Empty;
          this.CreateTime= DateTime.Now;
          this.CrateId= string.Empty;
+          this.TypeName= string.Empty;
+          this.TypeId= string.Empty;
        }

        /// <summary>
@@ -51,10 +52,6 @@ namespace OpenAuth.Domain
 	    /// 用户状态
 	    /// </summary>
        public int Status { get; set; }
-        /// <summary>
-	    /// 用户类型
-	    /// </summary>
-        public int Type { get; set; }
        /// <summary>
 	    /// 业务对照码
 	    /// </summary>
@@ -67,6 +64,14 @@ namespace OpenAuth.Domain
 	    /// 创建人
 	    /// </summary>
        public string CrateId { get; set; }
+        /// <summary>
+	    /// 分类名称
+	    /// </summary>
+        public string TypeName { get; set; }
+        /// <summary>
+	    /// 分类ID
+	    /// </summary>
+        public string TypeId { get; set; }

    }
 }
--- a/OpenAuth.Repository/Domain/UserExt.cs
+++ b/OpenAuth.Repository/Domain/UserExt.cs
@@ -1,6 +1,6 @@
 using System;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
 	/// <summary>
 	/// 用户ID
--- a/OpenAuth.Repository/Domain/WFFrmMain.cs
+++ b/OpenAuth.Repository/Domain/WFFrmMain.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 表单模板表
--- a/OpenAuth.Repository/Domain/WFProcessInstance.cs
+++ b/OpenAuth.Repository/Domain/WFProcessInstance.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 工作流流程实例表
@@ -103,6 +103,7 @@ namespace OpenAuth.Domain
 	    /// </summary>
        public string MakerList { get; set; }

+
        #region 扩展操作
        /// <summary>
        /// 新增调用
--- a/OpenAuth.Repository/Domain/WFProcessOperationHistory.cs
+++ b/OpenAuth.Repository/Domain/WFProcessOperationHistory.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 工作流实例操作记录
--- a/OpenAuth.Repository/Domain/WFProcessScheme.cs
+++ b/OpenAuth.Repository/Domain/WFProcessScheme.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 工作流实例模板对应表
@@ -42,6 +42,7 @@ namespace OpenAuth.Domain
 	    /// </summary>
        public int? ProcessType { get; set; }

+
        #region 扩展操作
        /// <summary>
        /// 新增调用
--- a/OpenAuth.Repository/Domain/WFProcessTransitionHistory.cs
+++ b/OpenAuth.Repository/Domain/WFProcessTransitionHistory.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 工作流实例流转历史记录
--- a/OpenAuth.Repository/Domain/WFSchemeContent.cs
+++ b/OpenAuth.Repository/Domain/WFSchemeContent.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 工作流模板内容表
--- a/OpenAuth.Repository/Domain/WFSchemeInfo.cs
+++ b/OpenAuth.Repository/Domain/WFSchemeInfo.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
    /// <summary>
 	/// 工作流模板信息表
--- a/OpenAuth.Repository/Interface/IRepository.cs
+++ b/OpenAuth.Repository/Interface/IRepository.cs
@@ -16,7 +16,7 @@ using System;
 using System.Linq;
 using System.Linq.Expressions;

-namespace OpenAuth.Domain.Interface
+namespace OpenAuth.Repository.Interface
 {
    public interface IRepository<T> where T : class
    {
--- a/OpenAuth.Repository/Interface/IUnitWork.cs
+++ b/OpenAuth.Repository/Interface/IUnitWork.cs
@@ -12,8 +12,9 @@
 using System;
 using System.Linq;
 using System.Linq.Expressions;
+using OpenAuth.Repository.Domain;

-namespace OpenAuth.Domain.Interface
+namespace OpenAuth.Repository.Interface
 {
    /// <summary>
    /// 工作单元接口
--- a/OpenAuth.Repository/Mapping/ApplicationMap.cs
+++ b/OpenAuth.Repository/Mapping/ApplicationMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class ApplicationMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.Application>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.Application>
    {
        public ApplicationMap()
        {
--- a/OpenAuth.Repository/Mapping/CategoryMap.cs
+++ b/OpenAuth.Repository/Mapping/CategoryMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class CategoryMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.Category>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.Category>
    {
        public CategoryMap()
        {
@@ -28,32 +28,28 @@ namespace OpenAuth.Repository.Models.Mapping
                .HasColumnName("Id")
                .HasMaxLength(50)
                .IsRequired();
-            Property(t => t.CascadeId)
-                .HasColumnName("CascadeId")
-                .HasMaxLength(255)
-                .IsRequired();
            Property(t => t.Name)
                .HasColumnName("Name")
                .HasMaxLength(255)
                .IsRequired();
-            Property(t => t.Code)
-                .HasColumnName("Code")
-                .HasMaxLength(255)
-                .IsOptional();
-            Property(t => t.Status)
-                .HasColumnName("Status")
+            Property(t => t.Disabled)
+                .HasColumnName("Disabled")
                .IsRequired();
            Property(t => t.SortNo)
                .HasColumnName("SortNo")
                .IsRequired();
+            Property(t => t.Icon)
+                .HasColumnName("Icon")
+                .HasMaxLength(255)
+                .IsOptional();
+            Property(t => t.Description)
+                .HasColumnName("Description")
+                .HasMaxLength(500)
+                .IsOptional();
            Property(t => t.TypeId)
                .HasColumnName("TypeId")
                .HasMaxLength(50)
                .IsOptional();
-            Property(t => t.ParentId)
-                .HasColumnName("ParentId")
-                .HasMaxLength(50)
-                .IsOptional();

            // Relationships
        }
--- a/OpenAuth.Repository/Mapping/CategoryTypeMap.cs
+++ b/OpenAuth.Repository/Mapping/CategoryTypeMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class CategoryTypeMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.CategoryType>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.CategoryType>
    {
        public CategoryTypeMap()
        {
@@ -32,17 +32,9 @@ namespace OpenAuth.Repository.Models.Mapping
                .HasColumnName("Name")
                .HasMaxLength(255)
                .IsRequired();
-            Property(t => t.Code)
-                .HasColumnName("Code")
-                .HasMaxLength(255)
-                .IsOptional();
            Property(t => t.CreateTime)
                .HasColumnName("CreateTime")
-                .IsOptional();
-            Property(t => t.CreateUser)
-                .HasColumnName("CreateUser")
-                .HasMaxLength(50)
-                .IsOptional();
+                .IsRequired();

            // Relationships
        }
--- a/OpenAuth.Repository/Mapping/ModuleElementMap.cs
+++ b/OpenAuth.Repository/Mapping/ModuleElementMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class ModuleElementMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.ModuleElement>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.ModuleElement>
    {
        public ModuleElementMap()
        {
@@ -36,10 +36,6 @@ namespace OpenAuth.Repository.Models.Mapping
                .HasColumnName("Name")
                .HasMaxLength(255)
                .IsRequired();
-            Property(t => t.Type)
-                .HasColumnName("Type")
-                .HasMaxLength(50)
-                .IsRequired();
            Property(t => t.Attr)
                .HasColumnName("Attr")
                .HasMaxLength(500)
@@ -67,6 +63,14 @@ namespace OpenAuth.Repository.Models.Mapping
                .HasColumnName("ModuleId")
                .HasMaxLength(50)
                .IsRequired();
+            Property(t => t.TypeName)
+                .HasColumnName("TypeName")
+                .HasMaxLength(20)
+                .IsOptional();
+            Property(t => t.TypeId)
+                .HasColumnName("TypeId")
+                .HasMaxLength(50)
+                .IsOptional();

            // Relationships
        }
--- a/OpenAuth.Repository/Mapping/ModuleMap.cs
+++ b/OpenAuth.Repository/Mapping/ModuleMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class ModuleMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.Module>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.Module>
    {
        public ModuleMap()
        {
--- a/OpenAuth.Repository/Mapping/OrgMap.cs
+++ b/OpenAuth.Repository/Mapping/OrgMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class OrgMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.Org>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.Org>
    {
        public OrgMap()
        {
@@ -57,9 +57,6 @@ namespace OpenAuth.Repository.Models.Mapping
            Property(t => t.Status)
                .HasColumnName("Status")
                .IsRequired();
-            Property(t => t.Type)
-                .HasColumnName("Type")
-                .IsRequired();
            Property(t => t.BizCode)
                .HasColumnName("BizCode")
                .HasMaxLength(255)
@@ -81,6 +78,14 @@ namespace OpenAuth.Repository.Models.Mapping
                .HasColumnName("ParentId")
                .HasMaxLength(50)
                .IsOptional();
+            Property(t => t.TypeName)
+                .HasColumnName("TypeName")
+                .HasMaxLength(20)
+                .IsOptional();
+            Property(t => t.TypeId)
+                .HasColumnName("TypeId")
+                .HasMaxLength(50)
+                .IsOptional();

            // Relationships
        }
--- a/OpenAuth.Repository/Mapping/RelevanceMap.cs
+++ b/OpenAuth.Repository/Mapping/RelevanceMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class RelevanceMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.Relevance>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.Relevance>
    {
        public RelevanceMap()
        {
--- a/OpenAuth.Repository/Mapping/ResourceMap.cs
+++ b/OpenAuth.Repository/Mapping/ResourceMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class ResourceMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.Resource>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.Resource>
    {
        public ResourceMap()
        {
@@ -54,14 +54,18 @@ namespace OpenAuth.Repository.Models.Mapping
                .HasColumnName("ParentId")
                .HasMaxLength(50)
                .IsOptional();
-            Property(t => t.CategoryId)
-                .HasColumnName("CategoryId")
-                .HasMaxLength(50)
-                .IsOptional();
            Property(t => t.AppId)
                .HasColumnName("AppId")
                .HasMaxLength(50)
                .IsOptional();
+            Property(t => t.TypeName)
+                .HasColumnName("TypeName")
+                .HasMaxLength(20)
+                .IsOptional();
+            Property(t => t.TypeId)
+                .HasColumnName("TypeId")
+                .HasMaxLength(50)
+                .IsOptional();

            // Relationships
        }
--- a/OpenAuth.Repository/Mapping/RoleMap.cs
+++ b/OpenAuth.Repository/Mapping/RoleMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class RoleMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.Role>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.Role>
    {
        public RoleMap()
        {
@@ -35,16 +35,21 @@ namespace OpenAuth.Repository.Models.Mapping
            Property(t => t.Status)
                .HasColumnName("Status")
                .IsRequired();
-            Property(t => t.Type)
-                .HasColumnName("Type")
-                .IsRequired();
            Property(t => t.CreateTime)
                .HasColumnName("CreateTime")
                .IsRequired();
            Property(t => t.CreateId)
                .HasColumnName("CreateId")
                .HasMaxLength(50)
-                .IsRequired();
+                .IsOptional();
+            Property(t => t.TypeName)
+                .HasColumnName("TypeName")
+                .HasMaxLength(20)
+                .IsOptional();
+            Property(t => t.TypeId)
+                .HasColumnName("TypeId")
+                .HasMaxLength(50)
+                .IsOptional();

            // Relationships
        }
--- a/OpenAuth.Repository/Mapping/StockMap.cs
+++ b/OpenAuth.Repository/Mapping/StockMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class StockMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.Stock>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.Stock>
    {
        public StockMap()
        {
--- a/OpenAuth.Repository/Mapping/UserMap.cs
+++ b/OpenAuth.Repository/Mapping/UserMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class UserMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.User>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.User>
    {
        public UserMap()
        {
@@ -46,9 +46,6 @@ namespace OpenAuth.Repository.Models.Mapping
            Property(t => t.Status)
                .HasColumnName("Status")
                .IsRequired();
-            Property(t => t.Type)
-                .HasColumnName("Type")
-                .IsRequired();
            Property(t => t.BizCode)
                .HasColumnName("BizCode")
                .HasMaxLength(255)
@@ -60,6 +57,14 @@ namespace OpenAuth.Repository.Models.Mapping
                .HasColumnName("CrateId")
                .HasMaxLength(50)
                .IsOptional();
+            Property(t => t.TypeName)
+                .HasColumnName("TypeName")
+                .HasMaxLength(20)
+                .IsOptional();
+            Property(t => t.TypeId)
+                .HasColumnName("TypeId")
+                .HasMaxLength(50)
+                .IsOptional();

            // Relationships
        }
--- a/OpenAuth.Repository/Mapping/WFFrmMainMap.cs
+++ b/OpenAuth.Repository/Mapping/WFFrmMainMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class WFFrmMainMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.WFFrmMain>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFFrmMain>
    {
        public WFFrmMainMap()
        {
--- a/OpenAuth.Repository/Mapping/WFProcessInstanceMap.cs
+++ b/OpenAuth.Repository/Mapping/WFProcessInstanceMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class WFProcessInstanceMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.WFProcessInstance>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFProcessInstance>
    {
        public WFProcessInstanceMap()
        {
--- a/OpenAuth.Repository/Mapping/WFProcessOperationHistoryMap.cs
+++ b/OpenAuth.Repository/Mapping/WFProcessOperationHistoryMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class WFProcessOperationHistoryMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.WFProcessOperationHistory>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFProcessOperationHistory>
    {
        public WFProcessOperationHistoryMap()
        {
--- a/OpenAuth.Repository/Mapping/WFProcessSchemeMap.cs
+++ b/OpenAuth.Repository/Mapping/WFProcessSchemeMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class WFProcessSchemeMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.WFProcessScheme>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFProcessScheme>
    {
        public WFProcessSchemeMap()
        {
--- a/OpenAuth.Repository/Mapping/WFProcessTransitionHistoryMap.cs
+++ b/OpenAuth.Repository/Mapping/WFProcessTransitionHistoryMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class WFProcessTransitionHistoryMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.WFProcessTransitionHistory>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFProcessTransitionHistory>
    {
        public WFProcessTransitionHistoryMap()
        {
--- a/OpenAuth.Repository/Mapping/WFSchemeContentMap.cs
+++ b/OpenAuth.Repository/Mapping/WFSchemeContentMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class WFSchemeContentMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.WFSchemeContent>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFSchemeContent>
    {
        public WFSchemeContentMap()
        {
--- a/OpenAuth.Repository/Mapping/WFSchemeInfoMap.cs
+++ b/OpenAuth.Repository/Mapping/WFSchemeInfoMap.cs
@@ -10,10 +10,10 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;

-namespace OpenAuth.Repository.Models.Mapping
+namespace OpenAuth.Repository.Mapping
 {
    public partial class WFSchemeInfoMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Domain.WFSchemeInfo>
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFSchemeInfo>
    {
        public WFSchemeInfoMap()
        {
--- a/OpenAuth.Repository/OpenAuthDBContext.cs
+++ b/OpenAuth.Repository/OpenAuthDBContext.cs
@@ -8,8 +8,8 @@
 //------------------------------------------------------------------------------

 using System.Data.Entity;
-using OpenAuth.Domain;
-using OpenAuth.Repository.Models.Mapping;
+using OpenAuth.Repository.Domain;
+using OpenAuth.Repository.Mapping;

 namespace OpenAuth.Repository
 {
--- a/OpenAuth.Repository/UnitWork.cs
+++ b/OpenAuth.Repository/UnitWork.cs
@@ -5,10 +5,8 @@ using System.Data.Entity.Validation;
 using System.Linq;
 using System.Linq.Expressions;
 using EntityFramework.Extensions;
-using OpenAuth.Domain.Interface;
 using Infrastructure;
-using OpenAuth.Domain;
-using OpenAuth.Repository.Models;
+using OpenAuth.Repository.Interface;

 namespace OpenAuth.Repository
 {