每一次都是大放血

CodeSmith/CSharp/Internal/Context.Generated.cst

@@ -77,7 +77,14 @@ namespace <%= ContextNamespace %>
         public System.Data.Entity.<%= InterfaceMode ? "I" : "" %>DbSet<<%= p.ClassName.ToSafeName() %>> <%= p.ContextName.ToSafeName() %> { get; set; }
 <% } // foreach %>
 
+        protected override void OnModelCreating(DbModelBuilder modelBuilder)
+        {
+<% foreach(var p in EntityContext.Entities) { %>
+            modelBuilder.Configurations.Add(new <%= p.MappingName.ToSafeName() %>());
+<% } // foreach %>
 
+           // InitializeMapping(modelBuilder);
+        }
 <% if (InterfaceMode) { %>
 
         System.Data.Entity.IDbSet<TEntity> IDbContext.Set<TEntity>()

OpenAuth.App/AuthoriseService.cs

@@ -12,7 +12,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenAuth.Domain;
+using OpenAuth.Repository.Domain;
 
 namespace OpenAuth.App
 {

OpenAuth.App/AuthorizeApp.cs

@@ -1,8 +1,8 @@
 using System.Linq;
 using Infrastructure;
 using OpenAuth.App.ViewModel;
-using OpenAuth.Domain;
+using OpenAuth.Repository.Domain;
-using OpenAuth.Domain.Interface;
+using OpenAuth.Repository.Interface;
 
 namespace OpenAuth.App
 {

OpenAuth.App/BaseApp.cs

@@ -1,5 +1,5 @@
-using OpenAuth.Domain;
+using OpenAuth.Repository.Domain;
-using OpenAuth.Domain.Interface;
+using OpenAuth.Repository.Interface;
 
 namespace OpenAuth.App
 {

OpenAuth.App/CategoryManagerApp.cs

@@ -1,153 +0,0 @@
-using Infrastructure;
-using OpenAuth.App.ViewModel;
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenAuth.App
-{
-    public class CategoryManagerApp
-    {
-          public IUnitWork _unitWork { get; set; }
-
-        public CategoryManagerApp(IUnitWork unitWork)
-        {
-            _unitWork = unitWork;
-        }
-
-
-        public List<Category> LoadAll()
-        {
-            return _unitWork.Find<Category>(null).ToList();
-        }
-
-        /// <summary>
-        /// 加载一个分类及子分类全部Categorys
-        /// </summary>
-        public GridData Load(string parentId, int pageindex, int pagesize)
-        {
-            IQueryable<Category> categories;
-            int total = 0;
-            if (parentId == string.Empty)
-            {
-                categories = _unitWork.Find<Category>(pageindex, pagesize);
-                total = _unitWork.GetCount<Category>();
-            }
-            else
-            {
-                var ids = GetSubCategories(parentId);
-                categories = _unitWork.Find<Category>(pageindex, pagesize, "SortNo", u => ids.Contains(u.Id));
-              //  total = _repository.GetCategoryCntInOrgs(ids);
-            }
-
-            var query = from c in categories
-                        join category in _unitWork.Find<Category>(null) on c.ParentId equals category.Id into temp
-                        from category in temp.DefaultIfEmpty()
-                        select new
-                        {
-                            c.CascadeId,
-                            c.Name,
-                            c.ParentId,
-                            ParentName = category.Name,
-                            c.SortNo,
-                            c.Status,
-                            c.Id
-                        };
-            return new GridData()
-            {
-                count = total,
-                data = query.ToList()
-            };
-        }
-
-        /// <summary>
-        /// 获取当前组织的所有下级组织
-        /// </summary>
-        private string[] GetSubCategories(string orgId)
-        {
-            var category = Find(orgId);
-            var categories = _unitWork.Find<Category>(u => u.CascadeId.Contains(category.CascadeId)).Select(u => u.Id).ToArray();
-            return categories;
-        }
-
-        public Category Find(string id)
-        {
-            var category = _unitWork.FindSingle<Category>(u => u.Id == id);
-            if (category == null) return new Category();
-
-            return category;
-        }
-
-        public void Delete(string[] ids)
-        {
-            _unitWork.Delete<Category>(u =>ids.Contains(u.Id));
-        }
-
-        public void AddOrUpdate(Category model)
-        {
-            Category category = new Category();
-            model.CopyTo(category);
-            ChangeModuleCascade(category);
-
-            if (category.Id == string.Empty)
-            {
-                _unitWork.Add(category);
-            }
-            else
-            {
-                //获取旧的的CascadeId
-                var CascadeId = _unitWork.FindSingle<Category>(o => o.Id == category.Id).CascadeId;
-                //根据CascadeId查询子分类
-                var categorys = _unitWork.Find<Category>(u => u.CascadeId.Contains(CascadeId) && u.Id != category.Id).OrderBy(u => u.CascadeId).ToList();
-
-                _unitWork.Update(category);
-
-                //更新子分类的CascadeId
-                foreach (var a in categorys)
-                {
-                    ChangeModuleCascade(a);
-                    _unitWork.Update(a);
-                }
-                _unitWork.Save();
-            }
-        }
-
-        #region 私有方法
-
-        //修改对象的级联ID，生成类似XXX.XXX.X.XX
-        private void ChangeModuleCascade(Category org)
-        {
-            string cascadeId;
-            int currentCascadeId = 1;  //当前结点的级联节点最后一位
-            var sameLevels = _unitWork.Find<Category>(o => o.ParentId == org.ParentId && o.Id != org.Id);
-            foreach (var obj in sameLevels)
-            {
-                int objCascadeId = int.Parse(obj.CascadeId.TrimEnd('.').Split('.').Last());
-                if (currentCascadeId <= objCascadeId) currentCascadeId = objCascadeId + 1;
-            }
-
-            if (org.ParentId != null && org.ParentId != string.Empty)
-            {
-                var parentOrg = _unitWork.FindSingle<Category>(o => o.Id == org.ParentId);
-                if (parentOrg != null)
-                {
-                    cascadeId = parentOrg.CascadeId  + currentCascadeId +".";
-                }
-                else
-                {
-                    throw new Exception("未能找到该组织的父节点信息");
-                }
-            }
-            else
-            {
-                cascadeId = ".0." + currentCascadeId +".";
-            }
-
-            org.CascadeId = cascadeId;
-        }
-
-        #endregion 私有方法
-    }
-}

OpenAuth.App/ModuleManagerApp.cs

@@ -1,6 +1,6 @@
-using OpenAuth.Domain;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using OpenAuth.Repository.Domain;
-using OpenAuth.Domain.Interface;
+using OpenAuth.Repository.Interface;
 
 namespace OpenAuth.App
 {

OpenAuth.App/OpenAuth.App.csproj

@@ -82,7 +82,6 @@
   <ItemGroup>
     <Compile Include="AuthoriseService.cs" />
     <Compile Include="BaseApp.cs" />
-    <Compile Include="CategoryManagerApp.cs" />
     <Compile Include="AuthorizeApp.cs" />
     <Compile Include="Extention\IWF_Runtime.cs" />
     <Compile Include="Extention\WF_Runtime.cs" />

OpenAuth.App/OrgManagerApp.cs

@@ -1,9 +1,9 @@
-using OpenAuth.Domain;
+using System;
-using OpenAuth.Domain.Interface;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenAuth.App.ViewModel;
+using OpenAuth.Repository.Domain;
+using OpenAuth.Repository.Interface;
 
 namespace OpenAuth.App
 {

OpenAuth.App/RevelanceManagerApp.cs

@@ -1,9 +1,8 @@
-
+using System;
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenAuth.Repository.Domain;
+using OpenAuth.Repository.Interface;
 
 namespace OpenAuth.App
 {

OpenAuth.App/SSO/SSOAuthUtil.cs

@@ -3,8 +3,7 @@ using System.Web;
 using System.Web.Mvc;
 using Infrastructure;
 using Infrastructure.Cache;
-using OpenAuth.Domain;
+using OpenAuth.Repository.Domain;
-
 
 
 namespace OpenAuth.App.SSO

OpenAuth.App/SystemAuthService.cs

@@ -10,7 +10,7 @@
 // ***********************************************************************
 
 using System.Linq;
-using OpenAuth.Domain;
+using OpenAuth.Repository.Domain;
 
 namespace OpenAuth.App
 {

OpenAuth.App/UserManagerApp.cs

@@ -1,9 +1,9 @@
 using OpenAuth.App.ViewModel;
-using OpenAuth.Domain;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenAuth.App.Request;
+using OpenAuth.Repository.Domain;
 
 
 namespace OpenAuth.App
@@ -115,8 +115,7 @@ namespace OpenAuth.App
                     BizCode = user.BizCode,
                     Name = user.Name,
                     Sex = user.Sex,
-                    Status = user.Status,
+                    Status = user.Status
-                    Type = user.Type
                 });
             }
             string[] orgIds = view.OrganizationIds.Split(',').ToArray();

OpenAuth.App/ViewModel/ModuleView.cs

@@ -1,7 +1,7 @@
 using System;
 using Infrastructure;
-using OpenAuth.Domain;
 using System.Collections.Generic;
+using OpenAuth.Repository.Domain;
 
 namespace OpenAuth.App.ViewModel
 {

OpenAuth.App/ViewModel/RoleVM.cs

@@ -14,7 +14,7 @@
 
 using System;
 using Infrastructure;
-using OpenAuth.Domain;
+using OpenAuth.Repository.Domain;
 
 namespace OpenAuth.App.ViewModel
 {

OpenAuth.App/ViewModel/UserView.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Infrastructure;
-using OpenAuth.Domain;
+using OpenAuth.Repository.Domain;
 
 
 namespace OpenAuth.App.ViewModel

OpenAuth.App/ViewModel/UserWithAccessedCtrls.cs

@@ -14,7 +14,7 @@
 
 using System.Collections.Generic;
 using Infrastructure;
-using OpenAuth.Domain;
+using OpenAuth.Repository.Domain;
 
 
 namespace OpenAuth.App.ViewModel

OpenAuth.App/WFFormService.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenAuth.App.ViewModel;
-using OpenAuth.Domain;
+using OpenAuth.Repository.Domain;
-using OpenAuth.Domain.Interface;
+using OpenAuth.Repository.Interface;
 
 namespace OpenAuth.App
 {

OpenAuth.App/WFProcessInstanceService.cs

@@ -5,8 +5,8 @@ using Infrastructure;
 using OpenAuth.App.Extention;
 using OpenAuth.App.SSO;
 using OpenAuth.App.ViewModel;
-using OpenAuth.Domain;
+using OpenAuth.Repository.Domain;
-using OpenAuth.Domain.Interface;
+using OpenAuth.Repository.Interface;
 
 namespace OpenAuth.App
 {
@@ -22,8 +22,8 @@ namespace OpenAuth.App
         /// <summary>
         /// 获取实例进程信息实体
         /// </summary>
-        /// <param name="keyVlaue"></param>
+        /// <param name="keyVlaue">The key vlaue.</param>
-        /// <returns></returns>
+        /// <returns>WFProcessInstance.</returns>
         public WFProcessInstance GetEntity(string keyVlaue)
         {
             try

OpenAuth.App/WFSchemeService.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenAuth.App.ViewModel;
-using OpenAuth.Domain;
+using OpenAuth.Repository.Domain;
-using OpenAuth.Domain.Interface;
+using OpenAuth.Repository.Interface;
 
 namespace OpenAuth.App
 {

OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowDesignController.cs

@@ -7,8 +7,8 @@ using Infrastructure;
 using OpenAuth.App;
 using OpenAuth.App.SSO;
 using OpenAuth.App.ViewModel;
-using OpenAuth.Domain;
 using OpenAuth.Mvc.Controllers;
+using OpenAuth.Repository.Domain;
 
 namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
 {

OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowInstancesController.cs

@@ -1,10 +1,10 @@
 using Infrastructure;
 using OpenAuth.App;
 using OpenAuth.App.SSO;
-using OpenAuth.Domain;
 using OpenAuth.Mvc.Controllers;
 using System;
 using System.Web.Mvc;
+using OpenAuth.Repository.Domain;
 
 namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
 {

OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs

@@ -4,8 +4,8 @@ using System.Web.Mvc;
 using Infrastructure;
 using OpenAuth.App;
 using OpenAuth.App.SSO;
-using OpenAuth.Domain;
 using OpenAuth.Mvc.Controllers;
+using OpenAuth.Repository.Domain;
 
 namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
 {

OpenAuth.Mvc/AutofacExt.cs

@@ -17,8 +17,8 @@ using Autofac.Integration.Mvc;
 using OpenAuth.App;
 using System.Reflection;
 using System.Web.Mvc;
-using OpenAuth.Domain.Interface;
 using OpenAuth.Repository;
+using OpenAuth.Repository.Interface;
 
 namespace OpenAuth.Mvc
 {

OpenAuth.Mvc/Controllers/CategoryManagerController.cs

@@ -1,70 +0,0 @@
-
-using System;
-using System.Web.Mvc;
-using Infrastructure;
-using OpenAuth.App;
-using OpenAuth.Domain;
-using OpenAuth.Mvc.Models;
-
-namespace OpenAuth.Mvc.Controllers
-{
- public class CategoryManagerController : BaseController
-    {
-        public CategoryManagerApp App { get; set; }
-
-        //
-        // GET: /UserManager/
-        [Authenticate]
-        public ActionResult Index()
-        {
-            return View();
-        }
-
-        /// <summary>
-        /// 加载分类下面的所有分类
-        /// </summary>
-        public string Load(string parentId, int page = 1, int rows = 30)
-        {
-            return JsonHelper.Instance.Serialize(App.Load(parentId, page, rows));
-        }
-
-     public string LoadForTree()
-     {
-         return JsonHelper.Instance.Serialize(App.LoadAll());
-     }
-
-        //添加或修改Category
-        [HttpPost]
-        public string Add(Category model)
-        {
-            try
-            {
-                App.AddOrUpdate(model);
-                
-            }
-            catch (Exception ex)
-            {
-                Result.Code = 500;
-                Result.Message = ex.Message;
-            }
-            return JsonHelper.Instance.Serialize(Result);
-        }
-        [HttpPost]
-        public string Delete(string[] ids)
-        {
-            try
-            {
-                App.Delete(ids);
-            }
-            catch (Exception e)
-            {
-                  Result.Code = 500;
-                Result.Message = e.Message;
-            }
-
-            return JsonHelper.Instance.Serialize(Result);
-        }
-
-        
-    }
-}

OpenAuth.Mvc/Controllers/ModuleManagerController.cs

@@ -2,13 +2,13 @@
 using OpenAuth.App;
 using OpenAuth.App.SSO;
 using OpenAuth.App.ViewModel;
-using OpenAuth.Domain;
 using OpenAuth.Mvc.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Web.Mvc;
+using OpenAuth.Repository.Domain;
 
 namespace OpenAuth.Mvc.Controllers
 {

OpenAuth.Mvc/Controllers/OrgManagerController.cs

@@ -1,9 +1,9 @@
 using Infrastructure;
 using OpenAuth.App;
-using OpenAuth.Domain;
 using OpenAuth.Mvc.Models;
 using System;
 using System.Web.Mvc;
+using OpenAuth.Repository.Domain;
 
 namespace OpenAuth.Mvc.Controllers
 {

OpenAuth.Mvc/OpenAuth.Mvc.csproj

@@ -148,7 +148,6 @@
     <Compile Include="Areas\FlowManage\FlowManageAreaRegistration.cs" />
     <Compile Include="AutofacExt.cs" />
     <Compile Include="Controllers\BaseController.cs" />
-    <Compile Include="Controllers\CategoryManagerController.cs" />
     <Compile Include="Controllers\ErrorController.cs" />
     <Compile Include="Areas\FlowManage\Controllers\FlowInstancesController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
@@ -323,7 +322,6 @@
     <Content Include="layui\lay\modules\upload.js" />
     <Content Include="layui\lay\modules\util.js" />
     <Content Include="js\ztree.js" />
-    <Content Include="Views\CategoryManager\Index.cshtml" />
     <Content Include="Areas\FlowManage\Views\web.config" />
     <Content Include="Areas\FlowManage\Views\FlowDesign\FlowLineForm.cshtml" />
     <Content Include="Areas\FlowManage\Views\FlowDesign\FlowNodeForm.cshtml" />

OpenAuth.Mvc/Views/CategoryManager/Index.cshtml

@@ -1,50 +0,0 @@
-@section header{
-    <link rel="stylesheet" href="/css/user.css" media="all" />
-}
- <blockquote class="layui-elem-quote news_search">
-    <div class="layui-inline">
-        <div class="layui-input-inline">
-            <input type="text" value="" placeholder="请输入关键字" class="layui-input search_input">
-        </div>
-        <a class="layui-btn search_btn">查询</a>
-    </div>
-    <div class="layui-inline">
-        <a class="layui-btn layui-btn-normal usersAdd_btn">添加用户</a>
-    </div>
-    <div class="layui-inline">
-        <a class="layui-btn layui-btn-danger batchDel">批量删除</a>
-    </div>
-    <div class="layui-inline">
-        <div class="layui-form-mid layui-word-aux">　本页面刷新后除新添加的文章外所有操作无效，关闭页面所有数据重置</div>
-    </div>
-</blockquote>
-<div class="layui-form users_list">
-    <table class="layui-table">
-        <colgroup>
-            <col width="50">
-            <col>
-            <col width="18%">
-            <col width="8%">
-            <col width="12%">
-            <col width="12%">
-            <col width="18%">
-            <col width="15%">
-        </colgroup>
-        <thead>
-        <tr>
-            <th><input type="checkbox" name="" lay-skin="primary" lay-filter="allChoose" id="allChoose"></th>
-            <th>登录名</th>
-            <th>邮箱</th>
-            <th>性别</th>
-            <th>会员等级</th>
-            <th>会员状态</th>
-            <th>最后登录时间</th>
-            <th>操作</th>
-        </tr>
-        </thead>
-        <tbody class="users_content"></tbody>
-    </table>
-</div>
-<div id="page"></div>
-<script type="text/javascript" src="/layui/layui.js"></script>
-<script type="text/javascript" src="allUsers.js"></script>

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.Interface;
-using OpenAuth.Repository.Models;
 
 namespace OpenAuth.Repository
 {

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>
 	/// 应用

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; }
+        public bool Disabled { get; set; }
-        /// <summary>
-	    /// 当前状态
-	    /// </summary>
-        public int Status { 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; }
 
     }
 }

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; }
+        public System.DateTime CreateTime { get; set; }
-        /// <summary>
-	    /// 创建日期
-	    /// </summary>
-        public System.DateTime? CreateTime { get; set; }
-        /// <summary>
-	    /// 创建人
-	    /// </summary>
-        public string CreateUser { get; set; }
 
     }
 }

OpenAuth.Repository/Domain/Entity.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
     public abstract class Entity
     {

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>
 	/// 功能模块表

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; }
 
     }
 }

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; }
 
     }
 }

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>
 	/// 多对多关系集中映射

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; }
 
     }
 }

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; }
 
     }
 }

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>
 	/// 出入库信息表

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; }
 
     }
 }

OpenAuth.Repository/Domain/UserExt.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace OpenAuth.Domain
+namespace OpenAuth.Repository.Domain
 {
 	/// <summary>
 	/// 用户ID

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>
 	/// 表单模板表

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>
         /// 新增调用

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>
 	/// 工作流实例操作记录

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>
         /// 新增调用

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>
 	/// 工作流实例流转历史记录

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>
 	/// 工作流模板内容表

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>
 	/// 工作流模板信息表

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
     {

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>
     /// 工作单元接口

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()
         {

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)
+            Property(t => t.Disabled)
-                .HasColumnName("Code")
+                .HasColumnName("Disabled")
-                .HasMaxLength(255)
-                .IsOptional();
-            Property(t => t.Status)
-                .HasColumnName("Status")
                 .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
         }

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();
+                .IsRequired();
-            Property(t => t.CreateUser)
-                .HasColumnName("CreateUser")
-                .HasMaxLength(50)
-                .IsOptional();
 
             // Relationships
         }

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
         }

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()
         {

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
         }

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()
         {

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
         }

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
         }

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()
         {

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
         }

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()
         {

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()
         {

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()
         {

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()
         {

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()
         {

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()
         {

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()
         {

OpenAuth.Repository/OpenAuthDBContext.cs

@@ -8,8 +8,8 @@
 //------------------------------------------------------------------------------
 
 using System.Data.Entity;
-using OpenAuth.Domain;
+using OpenAuth.Repository.Domain;
-using OpenAuth.Repository.Models.Mapping;
+using OpenAuth.Repository.Mapping;
 
 namespace OpenAuth.Repository
 {

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.Interface;
-using OpenAuth.Repository.Models;
 
 namespace OpenAuth.Repository
 {

OpenAuth.UnitTest/AutofacExt.cs

@@ -3,8 +3,8 @@ using System.Web.Mvc;
 using Autofac;
 using Autofac.Integration.Mvc;
 using OpenAuth.App;
-using OpenAuth.Domain.Interface;
 using OpenAuth.Repository;
+using OpenAuth.Repository.Interface;
 
 namespace OpenAuth.UnitTest
 {

OpenAuth.UnitTest/TestFunction.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Text;
-using System.Collections.Generic;
 using Infrastructure;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 

OpenAuth.UnitTest/TestLogin.cs

@@ -1,10 +1,4 @@
-using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Text;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OpenAuth.App;
-using OpenAuth.Domain;
-using OpenAuth.Repository;
 
 namespace OpenAuth.UnitTest
 {

OpenAuth.UnitTest/TestOrg.cs

@@ -1,8 +1,7 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenAuth.App;
-using OpenAuth.App.ViewModel;
+using OpenAuth.Repository.Domain;
-using OpenAuth.Domain;
 
 namespace OpenAuth.UnitTest
 {

OpenAuth.UnitTest/TestWorkflow.cs

@@ -2,7 +2,7 @@
 using Infrastructure;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OpenAuth.App;
-using OpenAuth.Domain;
+using OpenAuth.Repository.Domain;
 
 namespace OpenAuth.UnitTest
 {

OpenAuth.WebApi/AutofacExt.cs

@@ -19,8 +19,8 @@ using Autofac;
 using Autofac.Integration.Mvc;
 using Autofac.Integration.WebApi;
 using OpenAuth.App;
-using OpenAuth.Domain.Interface;
 using OpenAuth.Repository;
+using OpenAuth.Repository.Interface;
 
 namespace OpenAuth.WebApi
 {