diff --git a/Infrastructure/Response.cs b/Infrastructure/Response.cs
index fb627d8c..385a115a 100644
--- a/Infrastructure/Response.cs
+++ b/Infrastructure/Response.cs
@@ -2,8 +2,32 @@
 {
     public class Response
     {
-        public bool Status = true;
-        public string Message = "操作成功";
-        public dynamic Result;
+        /// <summary>
+        /// 操作消息【当Status不为 200时，显示详细的错误信息】
+        /// </summary>
+        public string Message { get; set; }
+
+        /// <summary>
+        /// 操作状态码，200为正常
+        /// </summary>
+        public int Code { get; set; }
+
+        public Response()
+        {
+            Code = 200;
+        }
+    }
+
+
+    /// <summary>
+    /// WEBAPI通用返回泛型基类
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class Response<T> : Response
+    {
+        /// <summary>
+        /// 回传的结果
+        /// </summary>
+        public T Result { get; set; }
     }
 }
diff --git a/OpenAuth.App/AuthoriseFactory.cs b/OpenAuth.App/AuthoriseFactory.cs
new file mode 100644
index 00000000..5a2c28a5
--- /dev/null
+++ b/OpenAuth.App/AuthoriseFactory.cs
@@ -0,0 +1,28 @@
+using OpenAuth.Domain.Interface;
+
+namespace OpenAuth.Domain.Service
+{
+    /// <summary>
+    ///  Ȩ�޷��乤���������Ƿ��ǿ������˺Ŵ���
+    /// </summary>
+    public class AuthoriseFactory
+    {
+          public IUnitWork _unitWork { get; set; }
+
+        public AuthoriseService Create(string loginuser)
+        {
+            if (loginuser == "System")
+            {
+                return new SystemAuthService();
+            }
+            else
+            {
+                return  new AuthoriseService()
+                {
+                    _unitWork = _unitWork,
+                    User = _unitWork.FindSingle<User>(u =>u.Account == loginuser)
+                };
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenAuth.App/AuthoriseService.cs b/OpenAuth.App/AuthoriseService.cs
new file mode 100644
index 00000000..5fe6efff
--- /dev/null
+++ b/OpenAuth.App/AuthoriseService.cs
@@ -0,0 +1,131 @@
+// ***********************************************************************
+// Assembly         : OpenAuth.Domain
+// Author           : yubaolee
+// Created          : 04-21-2016
+//
+// Last Modified By : yubaolee
+// Last Modified On : 04-21-2016
+// Contact : Microsoft
+// File: AuthenService.cs
+// ***********************************************************************
+
+using OpenAuth.Domain.Interface;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenAuth.Domain.Service
+{
+    /// <summary>
+    /// 领域服务
+    /// <para>用户授权服务</para>
+    /// </summary>
+    public class AuthoriseService
+    {
+        public IUnitWork _unitWork { get; set; }
+        protected User _user;
+
+        private List<string> _userRoleIds;    //用户角色GUID
+
+        public List<Module> Modules
+        {
+            get { return GetModulesQuery().ToList(); }
+        }
+
+        public List<Role> Roles
+        {
+            get { return GetRolesQuery().ToList(); }
+        }
+
+        public List<ModuleElement> ModuleElements
+        {
+            get { return GetModuleElementsQuery().ToList(); }
+        }
+
+        public List<Resource> Resources
+        {
+            get { return GetResourcesQuery().ToList(); }
+        }
+
+        public List<Org> Orgs
+        {
+            get { return GetOrgsQuery().ToList(); }
+        }
+
+        public User User
+        {
+            get { return _user; }
+            set
+            {
+                _user = value;
+                _userRoleIds = _unitWork.Find<Relevance>(u => u.FirstId == _user.Id && u.Key == "UserRole").Select(u => u.SecondId).ToList();
+            }
+        }
+
+        public void Check(string userName, string password)
+        {
+            var _user = _unitWork.FindSingle<User>(u => u.Account == userName);
+            if (_user == null)
+            {
+                throw new Exception("用户帐号不存在");
+            }
+            _user.CheckPassword(password);
+        }
+
+        /// <summary>
+        /// 用户可访问的机构
+        /// </summary>
+        /// <returns>IQueryable&lt;Org&gt;.</returns>
+        public virtual IQueryable<Org> GetOrgsQuery()
+        {
+            var orgids = _unitWork.Find<Relevance>(
+                u =>
+                    (u.FirstId == _user.Id && u.Key == "UserOrg") ||
+                    (u.Key == "RoleOrg" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
+            return _unitWork.Find<Org>(u => orgids.Contains(u.Id));
+        }
+
+        /// <summary>
+        /// 获取用户可访问的资源
+        /// </summary>
+        /// <returns>IQueryable&lt;Resource&gt;.</returns>
+        public virtual IQueryable<Resource> GetResourcesQuery()
+        {
+            var resourceIds = _unitWork.Find<Relevance>(
+                u =>
+                    (u.FirstId == _user.Id && u.Key == "UserResource") ||
+                    (u.Key == "RoleResource" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
+            return _unitWork.Find<Resource>(u => resourceIds.Contains(u.Id));
+        }
+
+        /// <summary>
+        /// 模块菜单权限
+        /// </summary>
+        public virtual IQueryable<ModuleElement> GetModuleElementsQuery()
+        {
+            var elementIds = _unitWork.Find<Relevance>(
+                u =>
+                    (u.FirstId == _user.Id && u.Key == "UserElement") ||
+                    (u.Key == "RoleElement" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
+            return _unitWork.Find<ModuleElement>(u => elementIds.Contains(u.Id));
+        }
+
+        /// <summary>
+        /// 得出最终用户拥有的模块
+        /// </summary>
+        public virtual IQueryable<Module> GetModulesQuery()
+        {
+            var moduleIds = _unitWork.Find<Relevance>(
+                u =>
+                    (u.FirstId == _user.Id && u.Key == "UserModule") ||
+                    (u.Key == "RoleModule" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
+            return _unitWork.Find<Module>(u => moduleIds.Contains(u.Id)).OrderBy(u => u.SortNo);
+        }
+
+        //用户角色
+        public virtual IQueryable<Role> GetRolesQuery()
+        {
+            return _unitWork.Find<Role>(u => _userRoleIds.Contains(u.Id));
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenAuth.App/CategoryManagerApp.cs b/OpenAuth.App/CategoryManagerApp.cs
index 8464ca9a..53021fec 100644
--- a/OpenAuth.App/CategoryManagerApp.cs
+++ b/OpenAuth.App/CategoryManagerApp.cs
@@ -10,31 +10,17 @@ namespace OpenAuth.App
 {
     public class CategoryManagerApp
     {
-        private ICategoryRepository _repository;
-        private IUnitWork _unitWork;
+          public IUnitWork _unitWork { get; set; }
 
-        public CategoryManagerApp(ICategoryRepository repository,
-            IUnitWork unitWork)
+        public CategoryManagerApp(IUnitWork unitWork)
         {
-            _repository = repository;
             _unitWork = unitWork;
         }
 
-        public int GetCategoryCntInOrg(string orgId)
-        {
-            if (orgId == string.Empty)
-            {
-                return _repository.Find(null).Count();
-            }
-            else
-            {
-                return _repository.GetCategoryCntInOrgs(GetSubCategories(orgId));
-            }
-        }
 
         public List<Category> LoadAll()
         {
-            return _repository.Find(null).ToList();
+            return _unitWork.Find<Category>(null).ToList();
         }
 
         /// <summary>
@@ -47,13 +33,13 @@ namespace OpenAuth.App
             if (parentId == string.Empty)
             {
                 categories = _unitWork.Find<Category>(pageindex, pagesize);
-                total = _repository.GetCount();
+                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);
+              //  total = _repository.GetCategoryCntInOrgs(ids);
             }
 
             var query = from c in categories
@@ -72,9 +58,7 @@ namespace OpenAuth.App
             return new GridData()
             {
                 count = total,
-                total = (int)Math.Ceiling((double)total/pagesize),
-                data = query.ToList(),
-                page = pageindex
+                data = query.ToList()
             };
         }
 
@@ -84,13 +68,13 @@ namespace OpenAuth.App
         private string[] GetSubCategories(string orgId)
         {
             var category = Find(orgId);
-            var categories = _repository.Find(u => u.CascadeId.Contains(category.CascadeId)).Select(u => u.Id).ToArray();
+            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 = _repository.FindSingle(u => u.Id == id);
+            var category = _unitWork.FindSingle<Category>(u => u.Id == id);
             if (category == null) return new Category();
 
             return category;
@@ -98,7 +82,7 @@ namespace OpenAuth.App
 
         public void Delete(string[] ids)
         {
-            _repository.Delete(u =>ids.Contains(u.Id));
+            _unitWork.Delete<Category>(u =>ids.Contains(u.Id));
         }
 
         public void AddOrUpdate(Category model)
@@ -109,23 +93,24 @@ namespace OpenAuth.App
 
             if (category.Id == string.Empty)
             {
-                _repository.Add(category);
+                _unitWork.Add(category);
             }
             else
             {
                 //获取旧的的CascadeId
-                var CascadeId = _repository.FindSingle(o => o.Id == category.Id).CascadeId;
+                var CascadeId = _unitWork.FindSingle<Category>(o => o.Id == category.Id).CascadeId;
                 //根据CascadeId查询子分类
-                var categorys = _repository.Find(u => u.CascadeId.Contains(CascadeId) && u.Id != category.Id).OrderBy(u => u.CascadeId).ToList();
+                var categorys = _unitWork.Find<Category>(u => u.CascadeId.Contains(CascadeId) && u.Id != category.Id).OrderBy(u => u.CascadeId).ToList();
 
-                _repository.Update(category);
+                _unitWork.Update(category);
 
                 //更新子分类的CascadeId
                 foreach (var a in categorys)
                 {
                     ChangeModuleCascade(a);
-                    _repository.Update(a);
+                    _unitWork.Update(a);
                 }
+                _unitWork.Save();
             }
         }
 
@@ -136,7 +121,7 @@ namespace OpenAuth.App
         {
             string cascadeId;
             int currentCascadeId = 1;  //当前结点的级联节点最后一位
-            var sameLevels = _repository.Find(o => o.ParentId == org.ParentId && o.Id != org.Id);
+            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());
@@ -145,7 +130,7 @@ namespace OpenAuth.App
 
             if (org.ParentId != null && org.ParentId != string.Empty)
             {
-                var parentOrg = _repository.FindSingle(o => o.Id == org.ParentId);
+                var parentOrg = _unitWork.FindSingle<Category>(o => o.Id == org.ParentId);
                 if (parentOrg != null)
                 {
                     cascadeId = parentOrg.CascadeId  + currentCascadeId +".";
diff --git a/OpenAuth.App/ModuleElementManagerApp.cs b/OpenAuth.App/ModuleElementManagerApp.cs
deleted file mode 100644
index 1b4790f5..00000000
--- a/OpenAuth.App/ModuleElementManagerApp.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// ***********************************************************************
-// Assembly         : OpenAuth.App
-// Author           : Yubao Li
-// Created          : 12-02-2015
-//
-// Last Modified By : Yubao Li
-// Last Modified On : 12-02-2015
-// ***********************************************************************
-// <copyright file="ModuleElementManagerApp.cs" company="">
-//     Copyright (c) . All rights reserved.
-// </copyright>
-// <summary>模块元素</summary>
-// ***********************************************************************
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using Infrastructure;
-using OpenAuth.App.SSO;
-using OpenAuth.App.ViewModel;
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-using OpenAuth.Domain.Service;
-
-namespace OpenAuth.App
-{
-    public class ModuleElementManagerApp
-    {
-        private ModuleEleManService _moduleEleManService;
-
-        public ModuleElementManagerApp(ModuleEleManService moduleEleManService)
-        {
-            _moduleEleManService = moduleEleManService;
-        }
-
-        public void AddOrUpdate(ModuleElement model)
-        {
-            var newbtn = new ModuleElement();
-            model.CopyTo(newbtn);
-            _moduleEleManService.AddOrUpdate(newbtn);
-        }
-
-        public IEnumerable<ModuleElement> LoadByModuleId(string id)
-        {
-            string username = AuthUtil.GetUserName();
-            return _moduleEleManService.LoadByModuleId(username, id);
-        }
-
-        /// <summary> 
-        /// 获取带有授权状态的菜单列表
-        /// </summary>
-        /// <param name="accessType">授权类型，当前有RoleElement/UserElement</param>
-        /// <param name="firstId">
-        /// 当为RoleElement时，表示RoleId
-        /// 当为UserElement时，表示UserId
-        /// </param>
-        /// <param name="moduleId">模块ID</param>
-        public List<dynamic> LoadWithAccess(string accessType, string firstId, string moduleId)
-        {
-            string username = AuthUtil.GetUserName();
-           return _moduleEleManService.LoadWithAccess(username, accessType, firstId, moduleId);
-        }
-
-        public void Delete(string[] objs)
-        {
-            _moduleEleManService.Delete(objs);
-        }
-    }
-}
diff --git a/OpenAuth.App/ModuleManagerApp.cs b/OpenAuth.App/ModuleManagerApp.cs
index 96866a0a..7ecfd5c8 100644
--- a/OpenAuth.App/ModuleManagerApp.cs
+++ b/OpenAuth.App/ModuleManagerApp.cs
@@ -1,26 +1,22 @@
 using OpenAuth.Domain;
 using System.Collections.Generic;
+using OpenAuth.Domain.Interface;
 using OpenAuth.Domain.Service;
 
 namespace OpenAuth.App
 {
     public class ModuleManagerApp
     {
-        private ModuleManService _moduleManService;
-
-        public ModuleManagerApp(ModuleManService moduleManService)
-        {
-            _moduleManService = moduleManService;
-        }
+          public IUnitWork _unitWork { get; set; }
 
         public void Delete(string id)
         {
-            _moduleManService.Delete(id);
+          //  _unitWork.Delete<Module>(id);
         }
 
         public void AddOrUpdate(Module vm)
         {
-           _moduleManService.AddOrUpdate(vm);
+         //  _moduleManService.AddOrUpdate(vm);
         }
 
         #region 用户/角色分配模块
@@ -32,7 +28,7 @@ namespace OpenAuth.App
         /// <param name="userId">The user unique identifier.</param>
         public List<Module> LoadForUser(string userId)
         {
-            return _moduleManService.LoadForUser(userId);
+            return null;
         }
 
         /// <summary>
@@ -41,7 +37,7 @@ namespace OpenAuth.App
         /// <param name="roleId">The role unique identifier.</param>
         public List<Module> LoadForRole(string roleId)
         {
-            return _moduleManService.LoadForRole(roleId);
+            return null;
         }
 
         #endregion 用户/角色分配模块
diff --git a/OpenAuth.App/OpenAuth.App.csproj b/OpenAuth.App/OpenAuth.App.csproj
index acf898d6..ccfd7626 100644
--- a/OpenAuth.App/OpenAuth.App.csproj
+++ b/OpenAuth.App/OpenAuth.App.csproj
@@ -80,6 +80,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AuthoriseFactory.cs" />
+    <Compile Include="AuthoriseService.cs" />
     <Compile Include="CategoryManagerApp.cs" />
     <Compile Include="AuthorizeApp.cs" />
     <Compile Include="Extention\IWF_Runtime.cs" />
@@ -89,14 +91,12 @@
     <Compile Include="Request\IdPageReq.cs" />
     <Compile Include="Request\PageReq.cs" />
     <Compile Include="Request\QueryUserListReq.cs" />
+    <Compile Include="RevelanceManagerApp.cs" />
+    <Compile Include="SystemAuthService.cs" />
     <Compile Include="WFFormService.cs" />
     <Compile Include="WFProcessInstanceService.cs" />
     <Compile Include="WFSchemeService.cs" />
-    <Compile Include="ModuleElementManagerApp.cs" />
     <Compile Include="ModuleManagerApp.cs" />
-    <Compile Include="ResourceManagerApp.cs" />
-    <Compile Include="RevelanceManagerApp.cs" />
-    <Compile Include="RoleManagerApp.cs" />
     <Compile Include="SSO\AppInfo.cs" />
     <Compile Include="SSO\AppInfoService.cs" />
     <Compile Include="SSO\AuthUtil.cs" />
@@ -106,7 +106,6 @@
     <Compile Include="SSO\LoginResult.cs" />
     <Compile Include="SSO\SSOAuthAttribute.cs" />
     <Compile Include="SSO\UserAuthSession.cs" />
-    <Compile Include="StockManagerApp.cs" />
     <Compile Include="UserManagerApp.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="OrgManagerApp.cs" />
@@ -123,9 +122,9 @@
       <Project>{5FEAEC9A-4F1E-4EE7-B377-9DB1B0870DAC}</Project>
       <Name>Infrastructure</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OpenAuth.Domain\OpenAuth.Domain.csproj">
-      <Project>{6108da8e-92a1-4abe-b9f5-26d64d55ca2c}</Project>
-      <Name>OpenAuth.Domain</Name>
+    <ProjectReference Include="..\OpenAuth.Repository\OpenAuth.Repository.csproj">
+      <Project>{e8df8dea-e2cf-4bdb-8f4f-3f8205b0e03a}</Project>
+      <Name>OpenAuth.Repository</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/OpenAuth.App/OrgManagerApp.cs b/OpenAuth.App/OrgManagerApp.cs
index 8d17b9a8..5a80ba28 100644
--- a/OpenAuth.App/OrgManagerApp.cs
+++ b/OpenAuth.App/OrgManagerApp.cs
@@ -9,47 +9,7 @@ namespace OpenAuth.App
 {
     public class OrgManagerApp
     {
-        private IOrgRepository _repository;
-        private IRelevanceRepository _relevanceRepository;
-
-        public OrgManagerApp(IOrgRepository repository, IRelevanceRepository relevanceRepository)
-        {
-            _repository = repository;
-            _relevanceRepository = relevanceRepository;
-        }
-
-        public IList<Org> GetAll()
-        {
-            return _repository.LoadOrgs().ToList();
-        }
-
-        /// <summary>
-        /// 部门的直接子部门
-        /// <para>TODO:可以根据用户的喜好决定选择LoadAllChildren或LoadDirectChildren</para>
-        /// </summary>
-        /// <param name="orgId">The org unique identifier.</param>
-        /// <returns>IEnumerable{Org}.</returns>
-        public IList<Org> LoadDirectChildren(string orgId)
-        {
-            return _repository.Find(u => u.ParentId == orgId).ToList();
-        }
-
-        /// <summary>
-        /// 得到部门的所有子部门
-        /// <para>如果orgId为0，表示取得所有部门</para>
-        /// </summary>
-        public GridData LoadAllChildren(string orgId)
-        {
-            var query = _repository.GetSubOrgs(orgId);
-            return new GridData
-            {
-                page = 1,
-                data = query.ToList(),
-                count = query.Count(),
-                total = 1
-            };
-        }
-
+          public IUnitWork _unitWork { get; set; }
 
         /// <summary>
         /// 添加部门
@@ -62,23 +22,23 @@ namespace OpenAuth.App
             ChangeModuleCascade(org);
             if (org.Id == string.Empty)
             {
-                _repository.Add(org);
+                _unitWork.Add(org);
             }
             else
             {
                 //获取旧的的CascadeId
-                var CascadeId = _repository.FindSingle(o => o.Id == org.Id).CascadeId;
+                var CascadeId = _unitWork.FindSingle<Org>(o => o.Id == org.Id).CascadeId;
                 //根据CascadeId查询子部门
-                var orgs = _repository.Find(u => u.CascadeId.Contains(CascadeId) && u.Id != org.Id).OrderBy(u => u.CascadeId).ToList();
+                var orgs = _unitWork.Find<Org>(u => u.CascadeId.Contains(CascadeId) && u.Id != org.Id).OrderBy(u => u.CascadeId).ToList();
 
                 //更新操作
-                _repository.Update(org);
+                _unitWork.Update(org);
 
                 //更新子部门的CascadeId
                 foreach (var a in orgs)
                 {
                     ChangeModuleCascade(a);
-                    _repository.Update(a);
+                    _unitWork.Update(a);
                 }
             }
 
@@ -90,10 +50,10 @@ namespace OpenAuth.App
         /// </summary>
         public void DelOrg(string[] ids)
         {
-            var delOrg = _repository.Find(u => ids.Contains(u.Id)).ToList();
+            var delOrg = _unitWork.Find<Org>(u => ids.Contains(u.Id)).ToList();
             foreach (var org in delOrg)
             {
-                _repository.Delete(u => u.CascadeId.Contains(org.CascadeId));
+                _unitWork.Delete<Org>(u => u.CascadeId.Contains(org.CascadeId));
             }
         }
 
@@ -107,17 +67,17 @@ namespace OpenAuth.App
         {
             //用户角色
             var userRoleIds =
-                _relevanceRepository.Find(u => u.FirstId == userId && u.Key == "UserRole").Select(u => u.SecondId).ToList();
+                _unitWork.Find<Relevance>(u => u.FirstId == userId && u.Key == "UserRole").Select(u => u.SecondId).ToList();
 
             //用户角色与自己分配到的角色ID
             var moduleIds =
-                _relevanceRepository.Find(
+                _unitWork.Find<Relevance>(
                     u =>
                         (u.FirstId == userId && u.Key == "UserOrg") ||
                         (u.Key == "RoleOrg" && userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
 
             if (!moduleIds.Any()) return new List<Org>();
-            return _repository.Find(u => moduleIds.Contains(u.Id)).ToList();
+            return _unitWork.Find<Org>(u => moduleIds.Contains(u.Id)).ToList();
         }
 
         /// <summary>
@@ -127,11 +87,40 @@ namespace OpenAuth.App
         public List<Org> LoadForRole(string roleId)
         {
             var moduleIds =
-                _relevanceRepository.Find(u => u.FirstId == roleId && u.Key == "RoleOrg")
+                _unitWork.Find<Relevance>(u => u.FirstId == roleId && u.Key == "RoleOrg")
                     .Select(u => u.SecondId)
                     .ToList();
             if (!moduleIds.Any()) return new List<Org>();
-            return _repository.Find(u => moduleIds.Contains(u.Id)).ToList();
+            return _unitWork.Find<Org>(u => moduleIds.Contains(u.Id)).ToList();
+        }
+
+
+        /// <summary>
+        /// 得到部门的所有子部门
+        /// <para>如果orgId为0，表示取得所有部门</para>
+        /// </summary>
+        public GridData LoadAllChildren(string orgId)
+        {
+            var query = GetSubOrgs(orgId);
+            return new GridData
+            {
+                data = query.ToList(),
+                count = query.Count(),
+            };
+        }
+
+        public IEnumerable<Org> GetSubOrgs(string orgId)
+        {
+            string cascadeId = "0.";
+            if (!string.IsNullOrEmpty(orgId))
+            {
+                var org = _unitWork.FindSingle<Org>(u => u.Id == orgId);
+                if (org == null)
+                    throw new Exception("未能找到指定对象信息");
+                cascadeId = org.CascadeId;
+            }
+
+            return _unitWork.Find<Org>(u => u.CascadeId.Contains(cascadeId));
         }
 
         #region 私有方法
@@ -141,7 +130,7 @@ namespace OpenAuth.App
         {
             string cascadeId;
             int currentCascadeId = 1;  //当前结点的级联节点最后一位
-            var sameLevels = _repository.Find(o => o.ParentId == org.ParentId && o.Id != org.Id);
+            var sameLevels = _unitWork.Find<Org>(o => o.ParentId == org.ParentId && o.Id != org.Id);
             foreach (var obj in sameLevels)
             {
                 int objCascadeId = int.Parse(obj.CascadeId.TrimEnd('.').Split('.').Last());
@@ -150,7 +139,7 @@ namespace OpenAuth.App
 
             if (org.ParentId != null && org.ParentId != string.Empty)
             {
-                var parentOrg = _repository.FindSingle(o => o.Id == org.ParentId);
+                var parentOrg = _unitWork.FindSingle<Org>(o => o.Id == org.ParentId);
                 if (parentOrg != null)
                 {
                     cascadeId = parentOrg.CascadeId + currentCascadeId+".";
diff --git a/OpenAuth.App/ResourceManagerApp.cs b/OpenAuth.App/ResourceManagerApp.cs
deleted file mode 100644
index 044cb7c5..00000000
--- a/OpenAuth.App/ResourceManagerApp.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Infrastructure;
-using OpenAuth.App.ViewModel;
-using OpenAuth.Domain.Service;
-
-namespace OpenAuth.App
-{
-    public class ResourceManagerApp
-    {
-        private ResManagerService _resManagerService;
-
-        public ResourceManagerApp(ResManagerService resManagerService)
-        {
-            _resManagerService = resManagerService;
-        }
-
-        public int GetResourceCntInOrg(string orgId)
-        {
-            return _resManagerService.GetResourceCntInOrg(orgId);
-        }
-        
-        public List<Resource> LoadAll()
-        {
-            return _resManagerService.LoadAll();
-        }
-
-        /// <summary>
-        /// 加载一个节点下面的一个或全部Resources
-        /// </summary>
-        public dynamic Load(string username, string categoryId, int pageindex, int pagesize)
-        {
-            return _resManagerService.Load(username, categoryId, pageindex, pagesize);
-        }
-
-
-
-        public void Delete(string[] ids)
-        {
-            _resManagerService.Delete(ids);
-        }
-
-        public void AddOrUpdate(Resource model)
-        {
-            Resource resource  = new  Resource();
-            model.CopyTo(resource);
-            _resManagerService.AddOrUpdate(resource);
-           
-        }
-
-        /// <summary>
-        /// 获取带有授权状态的菜单列表
-        /// </summary>
-        /// <param name="accessType">授权类型，当前有RoleResource/UserResource</param>
-        /// <param name="firstId">
-        /// 当为RoleResource时，表示RoleId
-        /// 当为UserResource时，表示UserId
-        /// </param>
-        /// <param name="cId">分类ID</param>
-        public List<dynamic> LoadWithAccess(string username, string accessType, string firstId, string cId)
-        {
-            return _resManagerService.LoadWithAccess(username, accessType, firstId, cId);
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.App/RevelanceManagerApp.cs b/OpenAuth.App/RevelanceManagerApp.cs
index 8ab67257..aab0f212 100644
--- a/OpenAuth.App/RevelanceManagerApp.cs
+++ b/OpenAuth.App/RevelanceManagerApp.cs
@@ -1,44 +1,93 @@
-
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Infrastructure;
-
-using OpenAuth.App.ViewModel;
-
-namespace OpenAuth.App
-{
-    public class RevelanceManagerApp
-    {
-
-        private readonly IRelevanceRepository _relevanceRepository;
-
-        public RevelanceManagerApp(IRelevanceRepository relevanceRepository)
-        {
-            _relevanceRepository = relevanceRepository;
-        }
-
-        /// <summary>
-        /// 添加关联
-        /// <para>比如给用户分配资源，那么firstId就是用户ID，secIds就是资源ID列表</para>
-        /// </summary>
-        /// <param name="type">关联的类型，如"UserResource"</param>
-        public void Assign(string type, string firstId, string[] secIds)
-        {
-            _relevanceRepository.AddRelevance(type, secIds.ToLookup(u => firstId));
-        }
-
-        /// <summary>
-        /// 取消关联
-        /// </summary>
-        /// <param name="type">关联的类型，如"UserResource"</param>
-        /// <param name="firstId">The first identifier.</param>
-        /// <param name="secIds">The sec ids.</param>
-        public void UnAssign(string type, string firstId, string[] secIds)
-        {
-            _relevanceRepository.DeleteBy(type, secIds.ToLookup(u =>firstId));
-        }
-    }
+
+using OpenAuth.Domain;
+using OpenAuth.Domain.Interface;
+using System;
+using System.Linq;
+
+namespace OpenAuth.App
+{
+    public class RevelanceManagerApp
+    {
+
+          public IUnitWork _unitWork { get; set; }
+
+        /// <summary>
+        /// 添加关联
+        /// <para>比如给用户分配资源，那么firstId就是用户ID，secIds就是资源ID列表</para>
+        /// </summary>
+        /// <param name="type">关联的类型，如"UserResource"</param>
+        public void Assign(string type, string firstId, string[] secIds)
+        {
+            Assign(type, secIds.ToLookup(u => firstId));
+        }
+
+        public void Assign(string key, ILookup<string, string> idMaps)
+        {
+            DeleteBy(key, idMaps);
+            _unitWork.BatchAdd((from sameVals in idMaps
+                from value in sameVals
+                select new Relevance
+                {
+                    Key = key,
+                    FirstId = sameVals.Key,
+                    SecondId = value,
+                    OperateTime = DateTime.Now
+                }).ToArray());
+            _unitWork.Save();
+        }
+
+      
+
+        /// <summary>
+        /// 删除关联
+        /// </summary>
+        /// <param name="key">关联标识</param>
+        /// <param name="idMaps">关联的&lt;firstId, secondId&gt;数组</param>
+        public void DeleteBy(string key, ILookup<string, string> idMaps)
+        {
+            foreach (var sameVals in idMaps)
+            {
+                foreach (var value in sameVals)
+                {
+                    _unitWork.Delete<Relevance>(u => u.Key == key && u.FirstId == sameVals.Key && u.SecondId == value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 取消关联
+        /// </summary>
+        /// <param name="type">关联的类型，如"UserResource"</param>
+        /// <param name="firstId">The first identifier.</param>
+        /// <param name="secIds">The sec ids.</param>
+        public void UnAssign(string type, string firstId, string[] secIds)
+        {
+            DeleteBy(type, secIds.ToLookup(u =>firstId));
+        }
+
+        public void DeleteBy(string key, params string[] firstIds)
+        {
+            _unitWork.Delete<Relevance>(u => firstIds.Contains(u.FirstId) && u.Key == key);
+        }
+
+        /// <summary>
+        /// 添加新的关联
+        /// </summary>
+        /// <param name="key">关联标识</param>
+        /// <param name="idMaps">关联的&lt;firstId, secondId&gt;数组</param>
+        public void AddRelevance(string key, ILookup<string, string> idMaps)
+        {
+            DeleteBy(key, idMaps);
+            _unitWork.BatchAdd<Relevance>((from sameVals in idMaps
+                from value in sameVals
+                select new Relevance
+                {
+                    Key = key,
+                    FirstId = sameVals.Key,
+                    SecondId = value,
+                    OperateTime = DateTime.Now
+                }).ToArray());
+            _unitWork.Save();
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenAuth.App/RoleManagerApp.cs b/OpenAuth.App/RoleManagerApp.cs
deleted file mode 100644
index e1acd29b..00000000
--- a/OpenAuth.App/RoleManagerApp.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-using OpenAuth.App.ViewModel;
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-using System;
-using System.Collections.Generic;
-using System.Dynamic;
-using System.Linq;
-using Newtonsoft.Json.Linq;
-
-namespace OpenAuth.App
-{
-    public class RoleManagerApp
-    {
-        private IRoleRepository _repository;
-        private IOrgRepository _orgRepository;
-        private IRelevanceRepository _relevanceRepository;
-
-        public RoleManagerApp(IRoleRepository repository,
-            IOrgRepository orgRepository,
-            IRelevanceRepository relevanceRepository)
-        {
-            _repository = repository;
-            _orgRepository = orgRepository;
-            _relevanceRepository = relevanceRepository;
-        }
-
-        public int GetRoleCntInOrg(string orgId)
-        {
-            if (orgId == string.Empty)
-            {
-                return _repository.Find(null).Count();
-            }
-            else
-            {
-                return _repository.GetRoleCntInOrgs(GetSubOrgIds(orgId));
-            }
-        }
-
-        /// <summary>
-        /// 加载一个部门及子部门全部Roles
-        /// </summary>
-        public GridData Load(string orgId, int pageindex, int pagesize)
-        {
-            if (pageindex < 1) pageindex = 1; //TODO:如果列表为空新增加一个用户后，前端会传一个0过来，奇怪？？
-            IEnumerable<Role> roles;
-            int total = 0;
-            if (orgId == string.Empty)
-            {
-                roles = _repository.LoadRoles(pageindex, pagesize);
-                total = _repository.GetCount();
-            }
-            else
-            {
-                roles = _repository.LoadInOrgs(pageindex, pagesize, GetSubOrgIds(orgId));
-                total = _repository.GetRoleCntInOrgs(orgId);
-            }
-
-            var rolevms = new List<RoleVM>();
-            foreach (var role in roles)
-            {
-                RoleVM rolevm = role;
-                var orgs = _orgRepository.LoadByRole(role.Id);
-                rolevm.Organizations = string.Join(",", orgs.Select(u => u.Name).ToList());
-                rolevm.OrganizationIds = string.Join(",", orgs.Select(u => u.Id).ToList());
-                rolevms.Add(rolevm);
-            }
-
-            var result = new GridData
-            {
-                count = total,
-                total = (int)Math.Ceiling((double)total/pagesize),
-                data = rolevms.ToList(),
-                page = pageindex
-            };
-
-            return result;
-        }
-
-        /// <summary>
-        /// 获取当前组织的所有下级组织
-        /// </summary>
-        private string[] GetSubOrgIds(string orgId)
-        {
-            var orgs = _orgRepository.GetSubOrgs(orgId).Select(u => u.Id).ToArray();
-            return orgs;
-        }
-
-        public Role Find(string id)
-        {
-            var role = _repository.FindSingle(u => u.Id == id);
-            if (role == null) role = new Role();
-            return role;
-        }
-
-        public void Delete(string id)
-        {
-            _repository.Delete(id);
-        }
-
-        public void AddOrUpdate(JObject obj)
-        {
-            var role = obj.ToObject<Role>();
-            if (role.Id == string.Empty)
-            {
-                role.CreateTime = DateTime.Now;
-                _repository.Add(role);
-            }
-            else
-            {
-                _repository.Update(role);
-            }
-
-            string[] orgIds = obj["OrganizationIds"].ToString().Split(',').ToArray();
-
-            _relevanceRepository.DeleteBy("RoleOrg", role.Id);
-            _relevanceRepository.AddRelevance("RoleOrg", orgIds.ToLookup(u => role.Id));
-        }
-
-        public List<Role> LoadForUser(string userId)
-        {
-            return _repository.LoadForUser(userId).ToList();
-        }
-
-        public List<RoleVM> LoadForOrgAndUser(string orgId, string userId)
-        {
-            var userroles = LoadForUser(userId);
-            var orgroles = _repository.LoadInOrgs(GetSubOrgIds(orgId)).ToList();
-
-            var rolevms = new List<RoleVM>();
-            foreach (var role in orgroles)
-            {
-                RoleVM rolevm = role;
-                rolevm.Checked = userroles.Any(u => u.Id == role.Id);
-                var orgs = _orgRepository.LoadByRole(role.Id);
-                rolevm.Organizations = string.Join(",", orgs.Select(u => u.Name).ToList());
-                rolevm.OrganizationIds = string.Join(",", orgs.Select(u => u.Id).ToList());
-                rolevms.Add(rolevm);
-            }
-            return rolevms;
-        }
-
-        public List<string> GetUsersInRole(string ruleName)
-        {
-            var role = _repository.FindSingle(u => u.Name == ruleName);
-            if (role == null) return null;
-
-            return _relevanceRepository.Find(u => u.Key == "UserRole" 
-                       && u.SecondId == role.Id).Select(u => u.FirstId).ToList();
-        }
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.App/SSO/LoginResult.cs b/OpenAuth.App/SSO/LoginResult.cs
index 303daee7..2d9deaed 100644
--- a/OpenAuth.App/SSO/LoginResult.cs
+++ b/OpenAuth.App/SSO/LoginResult.cs
@@ -1,9 +1,9 @@
+using Infrastructure;
+
 namespace OpenAuth.App.SSO
 {
-    public class LoginResult
+    public class LoginResult :Response<string>
     {
-        public bool Success;
-        public string ErrorMsg;
         public string ReturnUrl;
         public string Token;
     }
diff --git a/OpenAuth.App/SSO/SSOAuthUtil.cs b/OpenAuth.App/SSO/SSOAuthUtil.cs
index 8e8e93bd..6975374b 100644
--- a/OpenAuth.App/SSO/SSOAuthUtil.cs
+++ b/OpenAuth.App/SSO/SSOAuthUtil.cs
@@ -62,14 +62,14 @@ namespace OpenAuth.App.SSO
                 //����Session
                 new ObjCacheProvider<UserAuthSession>().Create(currentSession.Token, currentSession, DateTime.Now.AddDays(10));
 
-                result.Success = true;
+                result.Code = 200;
                 result.ReturnUrl = appInfo.ReturnUrl;
                 result.Token = currentSession.Token;
             }
             catch (Exception ex)
             {
-                result.Success = false;
-                result.ErrorMsg = ex.Message;
+                result.Code = 500;
+                result.Message = ex.Message;
             }
 
             return result;
diff --git a/OpenAuth.App/StockManagerApp.cs b/OpenAuth.App/StockManagerApp.cs
deleted file mode 100644
index 7587ba7a..00000000
--- a/OpenAuth.App/StockManagerApp.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using OpenAuth.Domain;
-using Infrastructure;
-using OpenAuth.Domain.Service;
-
-namespace OpenAuth.App
-{
-    public class StockManagerApp
-    {
-        private StockManagerService _service;
-
-        public StockManagerApp(StockManagerService service)
-        {
-            _service = service;
-        }
-
-        /// <summary>
-        /// 根据部门ID得到进出库信息
-        /// </summary>
-        public dynamic Load(string username, string orgId, int page, int rows)
-        {
-            return _service.Load(username, orgId, page, rows);
-        }
-
-        public void Delete(string[] id)
-        {
-            _service.Delete(id);
-        }
-
-        public void AddOrUpdate(Stock model)
-        {
-            Stock stock  = new  Stock();
-            model.CopyTo(stock);
-            _service.AddOrUpdate(stock);
-           
-        }
-
-       
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.App/SystemAuthService.cs b/OpenAuth.App/SystemAuthService.cs
new file mode 100644
index 00000000..7bef0908
--- /dev/null
+++ b/OpenAuth.App/SystemAuthService.cs
@@ -0,0 +1,58 @@
+// ***********************************************************************
+// Assembly         : OpenAuth.Domain
+// Author           : yubaolee
+// Created          : 04-21-2016
+//
+// Last Modified By : yubaolee
+// Last Modified On : 04-21-2016
+// Contact : Microsoft
+// File: AuthenService.cs
+// ***********************************************************************
+
+using OpenAuth.Domain.Interface;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenAuth.Domain.Service
+{
+    /// <summary>
+    /// 领域服务
+    /// <para>超级管理员权限</para>
+    /// </summary>
+    public class SystemAuthService : AuthoriseService
+    {
+        public SystemAuthService()
+        {
+            _user = new User { Account = "System", Id = string.Empty };
+        }
+
+       
+
+        public override IQueryable<Org> GetOrgsQuery()
+        {
+            return _unitWork.Find<Org>(null);
+        }
+
+        public override IQueryable<Resource> GetResourcesQuery()
+        {
+            return _unitWork.Find<Resource>(null);
+        }
+
+        public override IQueryable<ModuleElement> GetModuleElementsQuery()
+        {
+            return _unitWork.Find<ModuleElement>(null);
+        }
+
+        public override IQueryable<Module> GetModulesQuery()
+        {
+            return _unitWork.Find<Module>(null);
+        }
+
+        public override IQueryable<Role> GetRolesQuery()
+        {
+            //用户角色
+            return _unitWork.Find<Role>(null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenAuth.App/UserManagerApp.cs b/OpenAuth.App/UserManagerApp.cs
index f34d14ca..8c0f3fc0 100644
--- a/OpenAuth.App/UserManagerApp.cs
+++ b/OpenAuth.App/UserManagerApp.cs
@@ -11,35 +11,15 @@ namespace OpenAuth.App
 {
     public class UserManagerApp
     {
-        private IUserRepository _repository;
-        private IOrgRepository _orgRepository;
-        private IRelevanceRepository _relevanceRepository;
+        public IUnitWork _unitWork { get; set; }
+        public RevelanceManagerApp ReleManagerApp { get; set; }
 
-        public UserManagerApp(IUserRepository repository,
-            IOrgRepository orgRepository,
-            IRelevanceRepository relevanceRepository)
-        {
-            _repository = repository;
-            _orgRepository = orgRepository;
-            _relevanceRepository = relevanceRepository;
-        }
 
         public User Get(string  account)
         {
-            return _repository.FindSingle(u => u.Account == account);
+            return _unitWork.FindSingle<User>(u => u.Account == account);
         }
 
-        public int GetUserCntInOrg(string orgId)
-        {
-            if (orgId == string.Empty)
-            {
-                return _repository.Find(null).Count();
-            }
-            else
-            {
-                return _repository.GetUserCntInOrgs(GetSubOrgIds(orgId));
-            }
-        }
 
         /// <summary>
         /// 加载一个部门及子部门全部用户
@@ -51,20 +31,20 @@ namespace OpenAuth.App
             int records = 0;
             if (request.orgId ==string.Empty)
             {
-                users = _repository.LoadUsers(request.page, request.limit);
-                records = _repository.GetCount();
+                users = _unitWork.Find<User>(null).OrderBy(u => u.Id).Skip((request.page - 1) * request.limit).Take(request.limit);
+                records = _unitWork.GetCount<User>();
             }
             else
             {
                 var ids = GetSubOrgIds(request.orgId);
-                users = _repository.LoadInOrgs(request.page, request.limit, ids);
-                records = _repository.GetUserCntInOrgs(ids);
+                users = _unitWork.Find<User>(u =>ids.Contains(u.Id)).OrderBy(u => u.Id).Skip((request.page - 1) * request.limit).Take(request.limit);
+                records = _unitWork.GetCount<User>();
             }
             var userviews = new List<UserView>();
             foreach (var user in users)
             {
-                UserView uv = user;
-                var orgs = _orgRepository.LoadByUser(user.Id);
+                UserView uv = user; 
+                var orgs = LoadByUser(user.Id);
                 uv.Organizations = string.Join(",", orgs.Select(u => u.Name).ToList());
                 uv.OrganizationIds = string.Join(",", orgs.Select(u => u.Id).ToList());
                 userviews.Add(uv);
@@ -73,9 +53,7 @@ namespace OpenAuth.App
             return new GridData
             {
                 count = records,
-                total = (int)Math.Ceiling((double)records / request.limit),
                 data = userviews,
-                page = request.page
             };
         }
 
@@ -84,18 +62,18 @@ namespace OpenAuth.App
         /// </summary>
         private string[] GetSubOrgIds(string orgId)
         {
-            var org = _orgRepository.FindSingle(u => u.Id == orgId);
-            var orgs = _orgRepository.Find(u => u.CascadeId.Contains(org.CascadeId)).Select(u => u.Id).ToArray();
+            var org = _unitWork.FindSingle<Org>(u => u.Id == orgId);
+            var orgs = _unitWork.Find<Org>(u => u.CascadeId.Contains(org.CascadeId)).Select(u => u.Id).ToArray();
             return orgs;
         }
 
         public UserView Find(string id)
         {
-            var user = _repository.FindSingle(u => u.Id == id);
+            var user = _unitWork.FindSingle<User>(u => u.Id == id);
             if (user == null) return new UserView();
 
             UserView view = user;
-            foreach (var org in _orgRepository.LoadByUser(id))
+            foreach (var org in LoadByUser(id))
             {
                 view.Organizations += "," + org.Name;
                 view.OrganizationIds += "," + org.Id;
@@ -107,10 +85,7 @@ namespace OpenAuth.App
 
         public void Delete(string[] ids)
         {
-            _repository.Delete(u => ids.Contains(u.Id));
-            _relevanceRepository.DeleteBy("UserOrg", ids);
-            _relevanceRepository.DeleteBy("UserModule", ids);
-            _relevanceRepository.DeleteBy("UserRole", ids);
+            _unitWork.Delete<User>(u => ids.Contains(u.Id));
         }
 
         public void AddOrUpdate(UserView view)
@@ -120,18 +95,19 @@ namespace OpenAuth.App
             User user = view;
             if (string.IsNullOrEmpty(view.Id))
             {
-                if (_repository.IsExist(u => u.Account == view.Account))
+                if (_unitWork.IsExist<User>(u => u.Account == view.Account))
                 {
                     throw new Exception("用户账号已存在");
                 }
                 user.CreateTime = DateTime.Now;
                 user.Password = user.Account; //初始密码与账号相同
-                _repository.Add(user);
+                _unitWork.Add(user);
+                _unitWork.Save();
                 view.Id = user.Id;   //要把保存后的ID存入view
             }
             else
             {
-                _repository.Update(u => u.Id == view.Id, u => new User
+                _unitWork.Update<User>(u => u.Id == view.Id, u => new User
                 {
                     Account = user.Account,
                     BizCode = user.BizCode,
@@ -143,13 +119,22 @@ namespace OpenAuth.App
             }
             string[] orgIds = view.OrganizationIds.Split(',').ToArray();
 
-            _relevanceRepository.DeleteBy("UserOrg", user.Id);
-            _relevanceRepository.AddRelevance("UserOrg", orgIds.ToLookup(u => user.Id));
+            ReleManagerApp.DeleteBy("UserOrg", user.Id);
+            ReleManagerApp.AddRelevance("UserOrg", orgIds.ToLookup(u => user.Id));
         }
 
-        public IEnumerable<User> GetUsers(IEnumerable<string> userids)
+        /// <summary>
+        /// 加载用户的所有机构
+        /// </summary>
+        public IEnumerable<Org> LoadByUser(string userId)
         {
-            return _repository.Find(u => userids.Contains(u.Id));
+            var result = from userorg in _unitWork.Find<Relevance>(null)
+                join org in _unitWork.Find<Org>(null) on userorg.SecondId equals org.Id
+                where userorg.FirstId == userId && userorg.Key == "UserOrg"
+                select org;
+            return result;
         }
+
+
     }
 }
\ No newline at end of file
diff --git a/OpenAuth.App/ViewModel/GridData.cs b/OpenAuth.App/ViewModel/GridData.cs
index 45315976..b1cb30bb 100644
--- a/OpenAuth.App/ViewModel/GridData.cs
+++ b/OpenAuth.App/ViewModel/GridData.cs
@@ -27,14 +27,7 @@ namespace OpenAuth.App.ViewModel
         /// 操作消息
         /// </summary>
         public string msg;
-        /// <summary>
-        /// 页码
-        /// </summary>
-        public int page;
-        /// <summary>
-        /// 总页数
-        /// </summary>
-        public int total;
+
         /// <summary>
         /// 总记录条数
         /// </summary>
diff --git a/OpenAuth.App/WFFormService.cs b/OpenAuth.App/WFFormService.cs
index 8ee59f24..84d8caaf 100644
--- a/OpenAuth.App/WFFormService.cs
+++ b/OpenAuth.App/WFFormService.cs
@@ -13,12 +13,7 @@ namespace OpenAuth.App
     /// </summary>
     public class WFFormService
     {
-        protected IUnitWork _unitWork;
-
-        public WFFormService(IUnitWork unitWork)
-        {
-            _unitWork = unitWork;
-        }
+        public IUnitWork _unitWork { get; set; }
 
         public List<WFFrmMain> GetAllList()
         {
@@ -39,12 +34,10 @@ namespace OpenAuth.App
         {
             var result = new GridData
             {
-                page = pageCurrent
+                count = _unitWork.Find<WFFrmMain>(null).Count(),
+                data = _unitWork.Find<WFFrmMain>(pageCurrent, pageSize, "ModifyDate descending", null).ToList()
             };
 
-            int cnt = _unitWork.Find<WFFrmMain>(null).Count();
-            result.total = cnt % pageSize == 0 ? cnt / pageSize : cnt / pageSize + 1;
-            result.data = _unitWork.Find<WFFrmMain>(pageCurrent, pageSize, "ModifyDate descending", null).ToList();
 
             return result;
         }
diff --git a/OpenAuth.App/WFProcessInstanceService.cs b/OpenAuth.App/WFProcessInstanceService.cs
index 12fc161b..9b9971d9 100644
--- a/OpenAuth.App/WFProcessInstanceService.cs
+++ b/OpenAuth.App/WFProcessInstanceService.cs
@@ -16,12 +16,7 @@ namespace OpenAuth.App
     /// </summary>
     public class WFProcessInstanceService 
     {
-        protected IUnitWork _unitWork;
-
-        public WFProcessInstanceService(IUnitWork unitWork)
-        {
-            _unitWork = unitWork;
-        }
+        public IUnitWork _unitWork { get; set; }
 
         #region 获取数据
         /// <summary>
@@ -306,27 +301,21 @@ namespace OpenAuth.App
         public GridData Load(string userid, string type, int pageCurrent, int pageSize)
         {
             //todo:待办/已办/我的
-            var result = new GridData
-            {
-                page = pageCurrent
-            };
+            var result = new GridData();
 
-            var cnt = _unitWork.Find<WFProcessInstance>(u => u.CreateUserId == userid).Count();
+            result.count = _unitWork.Find<WFProcessInstance>(u => u.CreateUserId == userid).Count();
             if (type == "inbox")   //待办事项
             {
-                result.total = cnt%pageSize == 0? cnt/pageSize : cnt/pageSize + 1;
                 result.data = _unitWork.Find<WFProcessInstance>(pageCurrent, pageSize, "CreateDate descending", null).ToList();
 
             }
             else if (type == "outbox")  //已办事项
             {
-                result.total = cnt % pageSize == 0 ? cnt / pageSize : cnt / pageSize + 1;
                 result.data = _unitWork.Find<WFProcessInstance>(pageCurrent, pageSize, "CreateDate descending", null).ToList();
 
             }
             else  //我的流程
             {
-                result.total = cnt % pageSize == 0 ? cnt / pageSize : cnt / pageSize + 1;
                 result.data = _unitWork.Find<WFProcessInstance>(pageCurrent, pageSize, "CreateDate descending", null).ToList();
             }
 
diff --git a/OpenAuth.App/WFSchemeService.cs b/OpenAuth.App/WFSchemeService.cs
index 77374008..4c799d50 100644
--- a/OpenAuth.App/WFSchemeService.cs
+++ b/OpenAuth.App/WFSchemeService.cs
@@ -13,12 +13,7 @@ namespace OpenAuth.App
     /// </summary>
     public class WFSchemeService
     {
-        protected IUnitWork _unitWork;
-
-        public WFSchemeService(IUnitWork unitWork)
-        {
-            _unitWork = unitWork;
-        }
+        public IUnitWork _unitWork { get; set; }
 
         /// <summary>
         /// 保存流程
@@ -109,13 +104,9 @@ namespace OpenAuth.App
 
         public GridData Load(int pageCurrent, int pageSize)
         {
-            var result = new GridData
-            {
-                page = pageCurrent
-            };
+            var result = new GridData();
 
-            int cnt = _unitWork.Find<WFSchemeInfo>(null).Count();
-            result.total = cnt%pageSize  ==0?cnt/pageSize:cnt/pageSize+1;
+            result.count = _unitWork.Find<WFSchemeInfo>(null).Count();
             result.data = _unitWork.Find<WFSchemeInfo>(pageCurrent, pageSize, "ModifyDate descending", null).ToList();
 
             return result;
diff --git a/OpenAuth.Domain/Interface/ICategoryRepository.cs b/OpenAuth.Domain/Interface/ICategoryRepository.cs
deleted file mode 100644
index b16a0ddf..00000000
--- a/OpenAuth.Domain/Interface/ICategoryRepository.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenAuth.Domain.Interface
-{
-    public interface ICategoryRepository :IRepository<Category>
-    {
-        IEnumerable<Category> LoadCategorys(int pageindex, int pagesize);
-
-        IEnumerable<Category> LoadInOrgs(params string[] orgId);
-        int GetCategoryCntInOrgs(params string[] orgIds);
-        IEnumerable<Category> LoadInOrgs(int pageindex, int pagesize, params string[] orgIds);
-
-        /// <summary>
-        /// 获取子分类ID
-        /// </summary>
-        string[] GetSubIds(string orgId);
-
-        void Delete(string id);
-
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Domain/Interface/IModuleRepository.cs b/OpenAuth.Domain/Interface/IModuleRepository.cs
deleted file mode 100644
index 302b9272..00000000
--- a/OpenAuth.Domain/Interface/IModuleRepository.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenAuth.Domain.Interface
-{
-    public interface IModuleRepository :IRepository<Module>
-    {
-        IEnumerable<Module> LoadModules(int pageindex, int pagesize);
-
-        IEnumerable<Module> LoadInOrgs(params string[] orgId);
-        int GetModuleCntInOrgs(params string[] orgIds);
-        IEnumerable<Module> LoadInOrgs(int pageindex, int pagesize, params string[] orgIds);
-
-        
-        void Delete(string id);
-
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Domain/Interface/IOrgRepository.cs b/OpenAuth.Domain/Interface/IOrgRepository.cs
deleted file mode 100644
index 78318cda..00000000
--- a/OpenAuth.Domain/Interface/IOrgRepository.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OpenAuth.Domain.Interface
-{
-    public  interface IOrgRepository :IRepository<Org>
-    {
-        IEnumerable<Org> LoadOrgs();
-
-        IEnumerable<Org> LoadByUser(string userId);
-
-        IEnumerable<Org> LoadByRole(string roleId);
-
-        /// <summary>
-        ///  获取包括自己在内的全部子部门
-        /// </summary>
-        /// <param name="orgId">部门ID</param>
-        IEnumerable<Org> GetSubOrgs(string orgId);
-    }
-}
diff --git a/OpenAuth.Domain/Interface/IRelevanceRepository.cs b/OpenAuth.Domain/Interface/IRelevanceRepository.cs
deleted file mode 100644
index 29e95cef..00000000
--- a/OpenAuth.Domain/Interface/IRelevanceRepository.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// ***********************************************************************
-// Assembly         : OpenAuth.Domain
-// Author           : Yubao Li
-// Created          : 11-30-2015
-//
-// Last Modified By : Yubao Li
-// Last Modified On : 11-30-2015
-// ***********************************************************************
-// <copyright file="IRelevanceRepository.cs" company="">
-//     Copyright (c) . All rights reserved.
-// </copyright>
-// <summary>多对多关系统一处理</summary>
-// ***********************************************************************
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenAuth.Domain.Interface
-{
-    public interface IRelevanceRepository : IRepository<Relevance>
-    {
-        void DeleteBy(string key, params string[] firstIds);
-        void DeleteBy(string key, ILookup<string, string> idMaps);
-
-        void AddRelevance( string key, ILookup<string, string>  idMaps);
-    }
-}
diff --git a/OpenAuth.Domain/Interface/IResourceRepository.cs b/OpenAuth.Domain/Interface/IResourceRepository.cs
deleted file mode 100644
index bd381c54..00000000
--- a/OpenAuth.Domain/Interface/IResourceRepository.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenAuth.Domain.Interface
-{
-    public interface IResourceRepository :IRepository<Resource>
-    {
-        IEnumerable<Resource> LoadResources(int pageindex, int pagesize);
-
-        IEnumerable<Resource> LoadInOrgs(params string[] orgId);
-        int GetResourceCntInOrgs(params string[] orgIds);
-        IEnumerable<Resource> LoadInOrgs(int pageindex, int pagesize, params string[] orgIds);
-        
-        void Delete(string id);
-
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Domain/Interface/IRoleRepository.cs b/OpenAuth.Domain/Interface/IRoleRepository.cs
deleted file mode 100644
index b4934d14..00000000
--- a/OpenAuth.Domain/Interface/IRoleRepository.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenAuth.Domain.Interface
-{
-    public interface IRoleRepository :IRepository<Role>
-    {
-        IEnumerable<Role> LoadRoles(int pageindex, int pagesize);
-
-        int GetRoleCntInOrgs(params string[] orgIds);
-        IEnumerable<Role> LoadInOrgs(int pageindex, int pagesize, params string[] orgIds);
-        IEnumerable<Role> LoadInOrgs(params string[] orgId);
-        IEnumerable<Role> LoadForUser(string userId);
-
-        void Delete(string id);
-
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Domain/Interface/IStockRepository.cs b/OpenAuth.Domain/Interface/IStockRepository.cs
deleted file mode 100644
index a1d6cc1f..00000000
--- a/OpenAuth.Domain/Interface/IStockRepository.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenAuth.Domain.Interface
-{
-    public interface IStockRepository :IRepository<Stock>
-    {
-        IEnumerable<Stock> LoadStocks(int pageindex, int pagesize);
-
-        IEnumerable<Stock> LoadInOrgs(params string[] orgId);
-        int GetStockCntInOrgs(params string[] orgIds);
-        IEnumerable<Stock> LoadInOrgs(int pageindex, int pagesize, params string[] orgIds);
-        
-        void Delete(string id);
-
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Domain/Interface/IUserRepository.cs b/OpenAuth.Domain/Interface/IUserRepository.cs
deleted file mode 100644
index 48b658be..00000000
--- a/OpenAuth.Domain/Interface/IUserRepository.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenAuth.Domain.Interface
-{
-    public interface IUserRepository :IRepository<User>
-    {
-        IEnumerable<User> LoadUsers(int pageindex, int pagesize);
-
-        IEnumerable<User> LoadInOrgs(params string[] orgId);
-        int GetUserCntInOrgs(params string[] orgIds);
-        IEnumerable<User> LoadInOrgs(int pageindex, int pagesize, params string[] orgIds);
-
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Domain/OpenAuth.Domain.csproj b/OpenAuth.Domain/OpenAuth.Domain.csproj
index c2532388..a6054cb0 100644
--- a/OpenAuth.Domain/OpenAuth.Domain.csproj
+++ b/OpenAuth.Domain/OpenAuth.Domain.csproj
@@ -42,44 +42,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Core\Application.cs" />
-    <Compile Include="Core\Category.cs" />
-    <Compile Include="Core\CategoryType.cs" />
-    <Compile Include="Core\UserExt.cs" />
-    <Compile Include="Core\Entity.cs" />
-    <Compile Include="Interface\ICategoryRepository.cs" />
-    <Compile Include="Interface\IModuleRepository.cs" />
-    <Compile Include="Interface\IOrgRepository.cs" />
-    <Compile Include="Interface\IRepository.cs" />
-    <Compile Include="Interface\IResourceRepository.cs" />
-    <Compile Include="Interface\IRoleRepository.cs" />
-    <Compile Include="Interface\IRelevanceRepository.cs" />
-    <Compile Include="Interface\IStockRepository.cs" />
-    <Compile Include="Interface\IUnitWork.cs" />
-    <Compile Include="Interface\IUserRepository.cs" />
-    <Compile Include="Core\Module.cs" />
-    <Compile Include="Core\ModuleElement.cs" />
-    <Compile Include="Core\Org.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Core\Relevance.cs" />
-    <Compile Include="Core\Resource.cs" />
-    <Compile Include="Core\Role.cs" />
-    <Compile Include="Service\AuthoriseFactory.cs" />
-    <Compile Include="Service\SystemAuthService.cs" />
-    <Compile Include="Service\AuthoriseService.cs" />
-    <Compile Include="Service\ModuleEleManService.cs" />
-    <Compile Include="Service\ModuleManService.cs" />
-    <Compile Include="Service\ResManagerService.cs" />
-    <Compile Include="Service\StockManagerService.cs" />
-    <Compile Include="Core\Stock.cs" />
-    <Compile Include="Core\User.cs" />
-    <Compile Include="Core\WFFrmMain.cs" />
-    <Compile Include="Core\WFProcessInstance.cs" />
-    <Compile Include="Core\WFProcessOperationHistory.cs" />
-    <Compile Include="Core\WFProcessScheme.cs" />
-    <Compile Include="Core\WFProcessTransitionHistory.cs" />
-    <Compile Include="Core\WFSchemeContent.cs" />
-    <Compile Include="Core\WFSchemeInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/OpenAuth.Domain/Service/AuthoriseFactory.cs b/OpenAuth.Domain/Service/AuthoriseFactory.cs
index 7bc4d1fa..5364581e 100644
--- a/OpenAuth.Domain/Service/AuthoriseFactory.cs
+++ b/OpenAuth.Domain/Service/AuthoriseFactory.cs
@@ -1,31 +1,31 @@
-using OpenAuth.Domain.Interface;
-
-namespace OpenAuth.Domain.Service
-{
-    /// <summary>
-    ///  Ȩ�޷��乤���������Ƿ��ǿ������˺Ŵ���
-    /// </summary>
-    public class AuthoriseFactory
-    {
-        private IUnitWork _unitWork;
-
-        public AuthoriseFactory(IUnitWork unitWork)
-        {
-            _unitWork = unitWork;
-        }
-        public AuthoriseService Create(string loginuser)
-        {
-            if (loginuser == "System")
-            {
-                return new SystemAuthService(_unitWork);
-            }
-            else
-            {
-                return  new AuthoriseService(_unitWork)
-                {
-                    User = _unitWork.FindSingle<User>(u =>u.Account == loginuser)
-                };
-            }
-        }
-    }
+using OpenAuth.Domain.Interface;
+
+namespace OpenAuth.Domain.Service
+{
+    /// <summary>
+    ///  Ȩ�޷��乤���������Ƿ��ǿ������˺Ŵ���
+    /// </summary>
+    public class AuthoriseFactory
+    {
+        private IUnitWork _unitWork;
+
+        public AuthoriseFactory(IUnitWork unitWork)
+        {
+            _unitWork = unitWork;
+        }
+        public AuthoriseService Create(string loginuser)
+        {
+            if (loginuser == "System")
+            {
+                return new SystemAuthService(_unitWork);
+            }
+            else
+            {
+                return  new AuthoriseService(_unitWork)
+                {
+                    User = _unitWork.FindSingle<User>(u =>u.Account == loginuser)
+                };
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenAuth.Domain/Service/AuthoriseService.cs b/OpenAuth.Domain/Service/AuthoriseService.cs
index 74828717..34d16e1b 100644
--- a/OpenAuth.Domain/Service/AuthoriseService.cs
+++ b/OpenAuth.Domain/Service/AuthoriseService.cs
@@ -1,136 +1,136 @@
-// ***********************************************************************
-// Assembly         : OpenAuth.Domain
-// Author           : yubaolee
-// Created          : 04-21-2016
-//
-// Last Modified By : yubaolee
-// Last Modified On : 04-21-2016
-// Contact : Microsoft
-// File: AuthenService.cs
-// ***********************************************************************
-
-using OpenAuth.Domain.Interface;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenAuth.Domain.Service
-{
-    /// <summary>
-    /// 领域服务
-    /// <para>用户授权服务</para>
-    /// </summary>
-    public class AuthoriseService
-    {
-        protected IUnitWork _unitWork;
-        protected User _user;
-
-        private List<string> _userRoleIds;    //用户角色GUID
-
-        public AuthoriseService(IUnitWork unitWork)
-        {
-            _unitWork = unitWork;
-        }
-
-        public List<Module> Modules
-        {
-            get { return GetModulesQuery().ToList(); }
-        }
-
-        public List<Role> Roles
-        {
-            get { return GetRolesQuery().ToList(); }
-        }
-
-        public List<ModuleElement> ModuleElements
-        {
-            get { return GetModuleElementsQuery().ToList(); }
-        }
-
-        public List<Resource> Resources
-        {
-            get { return GetResourcesQuery().ToList(); }
-        }
-
-        public List<Org> Orgs
-        {
-            get { return GetOrgsQuery().ToList(); }
-        }
-
-        public User User
-        {
-            get { return _user; }
-            set
-            {
-                _user = value;
-                _userRoleIds = _unitWork.Find<Relevance>(u => u.FirstId == _user.Id && u.Key == "UserRole").Select(u => u.SecondId).ToList();
-            }
-        }
-
-        public void Check(string userName, string password)
-        {
-            var _user = _unitWork.FindSingle<User>(u => u.Account == userName);
-            if (_user == null)
-            {
-                throw new Exception("用户帐号不存在");
-            }
-            _user.CheckPassword(password);
-        }
-
-        /// <summary>
-        /// 用户可访问的机构
-        /// </summary>
-        /// <returns>IQueryable&lt;Org&gt;.</returns>
-        public virtual IQueryable<Org> GetOrgsQuery()
-        {
-            var orgids = _unitWork.Find<Relevance>(
-                u =>
-                    (u.FirstId == _user.Id && u.Key == "UserOrg") ||
-                    (u.Key == "RoleOrg" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
-            return _unitWork.Find<Org>(u => orgids.Contains(u.Id));
-        }
-
-        /// <summary>
-        /// 获取用户可访问的资源
-        /// </summary>
-        /// <returns>IQueryable&lt;Resource&gt;.</returns>
-        public virtual IQueryable<Resource> GetResourcesQuery()
-        {
-            var resourceIds = _unitWork.Find<Relevance>(
-                u =>
-                    (u.FirstId == _user.Id && u.Key == "UserResource") ||
-                    (u.Key == "RoleResource" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
-            return _unitWork.Find<Resource>(u => resourceIds.Contains(u.Id));
-        }
-
-        /// <summary>
-        /// 模块菜单权限
-        /// </summary>
-        public virtual IQueryable<ModuleElement> GetModuleElementsQuery()
-        {
-            var elementIds = _unitWork.Find<Relevance>(
-                u =>
-                    (u.FirstId == _user.Id && u.Key == "UserElement") ||
-                    (u.Key == "RoleElement" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
-            return _unitWork.Find<ModuleElement>(u => elementIds.Contains(u.Id));
-        }
-
-        /// <summary>
-        /// 得出最终用户拥有的模块
-        /// </summary>
-        public virtual IQueryable<Module> GetModulesQuery()
-        {
-            var moduleIds = _unitWork.Find<Relevance>(
-                u =>
-                    (u.FirstId == _user.Id && u.Key == "UserModule") ||
-                    (u.Key == "RoleModule" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
-            return _unitWork.Find<Module>(u => moduleIds.Contains(u.Id)).OrderBy(u => u.SortNo);
-        }
-
-        //用户角色
-        public virtual IQueryable<Role> GetRolesQuery()
-        {
-            return _unitWork.Find<Role>(u => _userRoleIds.Contains(u.Id));
-        }
-    }
+// ***********************************************************************
+// Assembly         : OpenAuth.Domain
+// Author           : yubaolee
+// Created          : 04-21-2016
+//
+// Last Modified By : yubaolee
+// Last Modified On : 04-21-2016
+// Contact : Microsoft
+// File: AuthenService.cs
+// ***********************************************************************
+
+using OpenAuth.Domain.Interface;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenAuth.Domain.Service
+{
+    /// <summary>
+    /// 领域服务
+    /// <para>用户授权服务</para>
+    /// </summary>
+    public class AuthoriseService
+    {
+        protected IUnitWork _unitWork;
+        protected User _user;
+
+        private List<string> _userRoleIds;    //用户角色GUID
+
+        public AuthoriseService(IUnitWork unitWork)
+        {
+            _unitWork = unitWork;
+        }
+
+        public List<Module> Modules
+        {
+            get { return GetModulesQuery().ToList(); }
+        }
+
+        public List<Role> Roles
+        {
+            get { return GetRolesQuery().ToList(); }
+        }
+
+        public List<ModuleElement> ModuleElements
+        {
+            get { return GetModuleElementsQuery().ToList(); }
+        }
+
+        public List<Resource> Resources
+        {
+            get { return GetResourcesQuery().ToList(); }
+        }
+
+        public List<Org> Orgs
+        {
+            get { return GetOrgsQuery().ToList(); }
+        }
+
+        public User User
+        {
+            get { return _user; }
+            set
+            {
+                _user = value;
+                _userRoleIds = _unitWork.Find<Relevance>(u => u.FirstId == _user.Id && u.Key == "UserRole").Select(u => u.SecondId).ToList();
+            }
+        }
+
+        public void Check(string userName, string password)
+        {
+            var _user = _unitWork.FindSingle<User>(u => u.Account == userName);
+            if (_user == null)
+            {
+                throw new Exception("用户帐号不存在");
+            }
+            _user.CheckPassword(password);
+        }
+
+        /// <summary>
+        /// 用户可访问的机构
+        /// </summary>
+        /// <returns>IQueryable&lt;Org&gt;.</returns>
+        public virtual IQueryable<Org> GetOrgsQuery()
+        {
+            var orgids = _unitWork.Find<Relevance>(
+                u =>
+                    (u.FirstId == _user.Id && u.Key == "UserOrg") ||
+                    (u.Key == "RoleOrg" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
+            return _unitWork.Find<Org>(u => orgids.Contains(u.Id));
+        }
+
+        /// <summary>
+        /// 获取用户可访问的资源
+        /// </summary>
+        /// <returns>IQueryable&lt;Resource&gt;.</returns>
+        public virtual IQueryable<Resource> GetResourcesQuery()
+        {
+            var resourceIds = _unitWork.Find<Relevance>(
+                u =>
+                    (u.FirstId == _user.Id && u.Key == "UserResource") ||
+                    (u.Key == "RoleResource" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
+            return _unitWork.Find<Resource>(u => resourceIds.Contains(u.Id));
+        }
+
+        /// <summary>
+        /// 模块菜单权限
+        /// </summary>
+        public virtual IQueryable<ModuleElement> GetModuleElementsQuery()
+        {
+            var elementIds = _unitWork.Find<Relevance>(
+                u =>
+                    (u.FirstId == _user.Id && u.Key == "UserElement") ||
+                    (u.Key == "RoleElement" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
+            return _unitWork.Find<ModuleElement>(u => elementIds.Contains(u.Id));
+        }
+
+        /// <summary>
+        /// 得出最终用户拥有的模块
+        /// </summary>
+        public virtual IQueryable<Module> GetModulesQuery()
+        {
+            var moduleIds = _unitWork.Find<Relevance>(
+                u =>
+                    (u.FirstId == _user.Id && u.Key == "UserModule") ||
+                    (u.Key == "RoleModule" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
+            return _unitWork.Find<Module>(u => moduleIds.Contains(u.Id)).OrderBy(u => u.SortNo);
+        }
+
+        //用户角色
+        public virtual IQueryable<Role> GetRolesQuery()
+        {
+            return _unitWork.Find<Role>(u => _userRoleIds.Contains(u.Id));
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenAuth.Domain/Service/ModuleEleManService.cs b/OpenAuth.Domain/Service/ModuleEleManService.cs
deleted file mode 100644
index dcc1f2ee..00000000
--- a/OpenAuth.Domain/Service/ModuleEleManService.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// ***********************************************************************
-// Assembly         : OpenAuth.Domain
-// Author           : yubaolee
-// Created          : 05-27-2016
-//
-// Last Modified By : yubaolee
-// Last Modified On : 05-27-2016
-// Contact : Microsoft
-// File: ModuleEleManService.cs
-// ***********************************************************************
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenAuth.Domain.Interface;
-
-namespace OpenAuth.Domain.Service
-{
-    /// <summary>
-    /// 领域服务
-    /// <para>模块菜单管理服务</para>
-    /// </summary>
-    public class ModuleEleManService
-    {
-        private readonly IUnitWork _unitWork;
-        private readonly AuthoriseFactory _factory;
-
-        public ModuleEleManService(IUnitWork unitWork, AuthoriseFactory authoriseService)
-        {
-            _unitWork = unitWork;
-            _factory = authoriseService;
-        }
-
-        public void AddOrUpdate(ModuleElement model)
-        {
-            if (model.Id == string.Empty)
-            {
-                _unitWork.Add(model);
-            }
-            else
-            {
-                _unitWork.Update(model);
-            }
-
-            _unitWork.Save();
-        }
-
-        public IEnumerable<ModuleElement> LoadByModuleId(string loginuser, string id)
-        {
-            var service = _factory.Create(loginuser);
-            if (!service.GetModuleElementsQuery().Any()) //用户没有任何资源
-            {
-                return new List<ModuleElement>();
-            }
-
-            var modules = service.GetModuleElementsQuery().Where(u => u.ModuleId == id).OrderBy(u =>u.Sort);
-            return modules;
-        }
-
-        /// <summary>
-        /// 获取带有授权状态的菜单列表
-        /// </summary>
-        /// <param name="username">当前登录的操作人</param>
-        /// <param name="accessType">授权类型，当前有RoleElement/UserElement</param>
-        /// <param name="firstId">
-        /// 当为RoleElement时，表示RoleId
-        /// 当为UserElement时，表示UserId
-        /// </param>
-        /// <param name="moduleId">模块ID</param>
-        public List<dynamic> LoadWithAccess(string username, string accessType, string firstId, string moduleId)
-        {
-            var listVms = new List<dynamic>();
-            var service = _factory.Create(username);
-            if (!service.GetModuleElementsQuery().Any()) //用户没有任何资源
-            {
-               return listVms;
-            }
-            if (moduleId == string.Empty) return listVms;
-            foreach (var element in service.GetModuleElementsQuery().Where(u =>u.ModuleId ==moduleId))
-            {
-                var accessed = _unitWork.FindSingle<Relevance>(u =>u.Key == accessType 
-                    && u.FirstId == firstId && u.SecondId == element.Id);
-                var vm = new 
-                {
-                    Id = element.Id,
-                    Name = element.Name,
-                    ModuleId = element.ModuleId,
-                    DomId = element.DomId,
-                    Checked = accessed != null
-                };
-                listVms.Add(vm);
-            }
-            return listVms;
-        }
-
-        public void Delete(string[] objs)
-        {
-            _unitWork.Delete<ModuleElement>(u =>objs.Contains(u.Id));
-        }
-    }
-}
diff --git a/OpenAuth.Domain/Service/ModuleManService.cs b/OpenAuth.Domain/Service/ModuleManService.cs
deleted file mode 100644
index 31c644ef..00000000
--- a/OpenAuth.Domain/Service/ModuleManService.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// ***********************************************************************
-// Assembly         : OpenAuth.Domain
-// Author           : yubaolee
-// Created          : 05-27-2016
-//
-// Last Modified By : yubaolee
-// Last Modified On : 05-27-2016
-// Contact : Microsoft
-// File: ModuleManService.cs
-// ***********************************************************************
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenAuth.Domain.Interface;
-
-namespace OpenAuth.Domain.Service
-{
-    /// <summary>
-    /// 领域服务
-    /// <para>模块领域服务</para>
-    /// </summary>
-    public class ModuleManService
-    {
-        private readonly IModuleRepository _repository;
-        private readonly IRelevanceRepository _relevanceRepository;
-        private readonly AuthoriseFactory _factory;
-
-        public ModuleManService(IModuleRepository repository,
-            IRelevanceRepository relevanceRepository, AuthoriseFactory authoriseService)
-        {
-            _repository = repository;
-            _relevanceRepository = relevanceRepository;
-            _factory = authoriseService;
-        }
-
-        public void Delete(string id)
-        {
-            var del = _repository.FindSingle(u => u.Id == id);
-            if (del == null) return;
-
-            _repository.Delete(u => u.CascadeId.Contains(del.CascadeId));
-        }
-
-        public void AddOrUpdate(Module model)
-        {
-            ChangeModuleCascade(model);
-            if (string.IsNullOrEmpty(model.Id))
-            {
-                _repository.Add(model);
-            }
-            else
-            {
-                //获取旧的的CascadeId
-                var CascadeId = _repository.FindSingle(o => o.Id == model.Id).CascadeId;
-                //根据CascadeId查询子部门
-                var models = _repository.Find(u => u.CascadeId.Contains(CascadeId) && u.Id != model.Id).OrderBy(u => u.CascadeId).ToList();
-
-                _repository.Update(model);
-
-                //更新子部门的CascadeId
-                foreach (var a in models)
-                {
-                    ChangeModuleCascade(a);
-                    _repository.Update(a);
-                }
-            }
-        }
-
-        #region 用户/角色分配模块
-
-        /// <summary>
-        /// 加载特定用户的模块
-        /// </summary>
-        /// <param name="userId">The user unique identifier.</param>
-        public List<Module> LoadForUser(string userId)
-        {
-            //用户角色
-            var userRoleIds =
-                _relevanceRepository.Find(u => u.FirstId == userId && u.Key == "UserRole").Select(u => u.SecondId).ToList();
-
-            //用户角色与自己分配到的模块ID
-            var moduleIds =
-                _relevanceRepository.Find(
-                    u =>
-                        (u.FirstId == userId && u.Key == "UserModule") ||
-                        (u.Key == "RoleModule" && userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
-
-            //var moduleIds =
-            //    _relevanceRepository.Find(u => u.FirstId == userId && u.Key == "UserModule")
-            //        .Select(u => u.SecondId)
-            //        .ToList();
-            if (!moduleIds.Any()) return new List<Module>();
-            return _repository.Find(u => moduleIds.Contains(u.Id)).ToList();
-        }
-
-        /// <summary>
-        /// 加载特定角色的模块
-        /// </summary>
-        /// <param name="roleId">The role unique identifier.</param>
-        public List<Module> LoadForRole(string roleId)
-        {
-            var moduleIds =
-                _relevanceRepository.Find(u => u.FirstId == roleId && u.Key == "RoleModule")
-                    .Select(u => u.SecondId)
-                    .ToList();
-            if (!moduleIds.Any()) return new List<Module>();
-            return _repository.Find(u => moduleIds.Contains(u.Id)).ToList();
-        }
-
-        #endregion 用户/角色分配模块
-
-        #region 私有方法
-
-        //根据同一级中最大的语义ID
-
-        private string[] GetSubIds(string parentId)
-        {
-            if (parentId == string.Empty) return _repository.Find(null).Select(u => u.Id).ToArray();
-            var parent = _repository.FindSingle(u => u.Id == parentId);
-            var orgs = _repository.Find(u => u.CascadeId.Contains(parent.CascadeId)).Select(u => u.Id).ToArray();
-            return orgs;
-        }
-
-        //修改对象的级联ID
-        private void ChangeModuleCascade(Module module)
-        {
-            string cascadeId;
-            int currentCascadeId = 1;  //当前结点的级联节点最后一位
-            var sameLevels = _repository.Find(o => o.ParentId == module.ParentId && o.Id != module.Id);
-            foreach (var obj in sameLevels)
-            {
-                int objCascadeId = int.Parse(obj.CascadeId.TrimEnd('.').Split('.').Last());
-                if (currentCascadeId <= objCascadeId) currentCascadeId = objCascadeId + 1;
-            }
-
-            if (module.ParentId != null && module.ParentId != string.Empty)
-            {
-                var parentOrg = _repository.FindSingle(o => o.Id == module.ParentId);
-                if (parentOrg != null)
-                {
-                    cascadeId = parentOrg.CascadeId + currentCascadeId +".";
-                    module.ParentName = parentOrg.Name;
-                }
-                else
-                {
-                    throw new Exception("未能找到该组织的父节点信息");
-                }
-            }
-            else
-            {
-                cascadeId = ".0." + currentCascadeId +".";
-                module.ParentName = "根节点";
-            }
-
-            module.CascadeId = cascadeId;
-        }
-
-        #endregion 私有方法
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Domain/Service/ResManagerService.cs b/OpenAuth.Domain/Service/ResManagerService.cs
deleted file mode 100644
index 69ad8c1e..00000000
--- a/OpenAuth.Domain/Service/ResManagerService.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenAuth.Domain.Interface;
-
-namespace OpenAuth.Domain.Service
-{
-    /// <summary>
-    /// 领域服务
-    /// <para>资源管理领域</para>
-    /// </summary>
-    public class ResManagerService
-    {
-        private IResourceRepository _repository;
-        private readonly ICategoryRepository _categoryRepository;
-        private IRelevanceRepository _relevanceRepository;
-        private AuthoriseFactory _factory;
-
-        public ResManagerService(IResourceRepository repository,
-            ICategoryRepository categoryRepository,
-            IRelevanceRepository relevanceRepository,
-            AuthoriseFactory authoriseService)
-        {
-            _repository = repository;
-            _categoryRepository = categoryRepository;
-            _relevanceRepository = relevanceRepository;
-            _factory = authoriseService;
-        }
-
-        public int GetResourceCntInOrg(string orgId)
-        {
-            if (orgId == string.Empty)
-            {
-                return _repository.Find(null).Count();
-            }
-            else
-            {
-                return _repository.GetResourceCntInOrgs(_categoryRepository.GetSubIds(orgId));
-            }
-        }
-
-        public List<Resource> LoadAll()
-        {
-            return _repository.Find(null).ToList();
-        }
-
-        /// <summary>
-        /// 加载用户一个节点下面的一个或全部Resources
-        /// </summary>
-        public dynamic Load(string username, string categoryId, int page, int rows)
-        {
-            var service = _factory.Create(username);
-            if (!service.GetResourcesQuery().Any()) //用户没有任何资源
-            {
-                return new
-                {
-                    total = 0,
-                    page = 0,
-                    records = 0
-                };
-            }
-            var subIds = _categoryRepository.GetSubIds(categoryId);
-
-
-            var query = service.GetResourcesQuery().Where(u => categoryId == string.Empty ||
-            (u.CategoryId != null && subIds.Contains(u.CategoryId)));
-            int total = query.Count();
-
-            if (total <= 0)
-                return new
-                {
-                    total = 0,
-                    page = 0,
-                    records = 0
-                };
-
-            var listVms = new List<dynamic>();
-            var resources = query.OrderBy(u => u.SortNo).Skip((page - 1) * rows).Take(rows);
-            foreach (var element in resources)
-            {
-                var accessed = _categoryRepository.FindSingle(u => u.Id == element.CategoryId);
-                listVms.Add(new
-                {
-                    element.Id,
-                    element.Name,
-                    element.Key,
-                    element.SortNo,
-                    element.CategoryId,
-                    element.Status,
-                    CategoryName = accessed != null ? accessed.Name : ""
-                });
-            }
-
-            return new
-            {
-                records = total,
-                total = (int)Math.Ceiling((double)total / rows),
-                rows = listVms,
-                page = page
-            };
-        }
-
-
-
-        public Resource Find(string id)
-        {
-            var resource = _repository.FindSingle(u => u.Id == id);
-            if (resource == null) return new Resource();
-
-            return resource;
-        }
-
-        public void Delete(string[] ids)
-        {
-            _repository.Delete(u => ids.Contains(u.Id));
-        }
-
-        public void AddOrUpdate(Resource resource)
-        {
-            if (resource.Id == string.Empty)
-            {
-                _repository.Add(resource);
-            }
-            else
-            {
-                _repository.Update(resource);
-            }
-
-        }
-
-        /// <summary>
-        /// 获取带有授权状态的菜单列表
-        /// </summary>
-        /// <param name="accessType">授权类型，当前有RoleResource/UserResource</param>
-        /// <param name="firstId">
-        /// 当为RoleResource时，表示RoleId
-        /// 当为UserResource时，表示UserId
-        /// </param>
-        /// <param name="cId">分类ID</param>
-        public List<dynamic> LoadWithAccess(string username, string accessType, string firstId, string cId)
-        {
-            var listVms = new List<dynamic>();
-            var service = _factory.Create(username);
-            if (!service.GetResourcesQuery().Any()) //用户没有任何资源
-            {
-                return listVms;
-            }
-
-            var subIds = _categoryRepository.GetSubIds(cId);
-            var query = service.GetResourcesQuery().Where(u => cId == string.Empty || (u.CategoryId != null && subIds.Contains(u.CategoryId)));
-
-            foreach (var element in query)
-            {
-                var accessed = _relevanceRepository.FindSingle(u => u.Key == accessType
-                    && u.FirstId == firstId && u.SecondId == element.Id);
-                listVms.Add(new
-                {
-                    Id = element.Id,
-                    Name = element.Name,
-                    Checked = accessed != null,
-                    Description = element.Description,
-                    Key = element.Key,
-                    Status = element.Status
-                });
-            }
-            return listVms;
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Domain/Service/StockManagerService.cs b/OpenAuth.Domain/Service/StockManagerService.cs
deleted file mode 100644
index c87624a2..00000000
--- a/OpenAuth.Domain/Service/StockManagerService.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Linq;
-using System.Linq.Expressions;
-using OpenAuth.Domain.Interface;
-
-namespace OpenAuth.Domain.Service
-{
-    /// <summary>
-    /// 领域服务
-    /// <para>进出库管理服务</para>
-    /// </summary>
-    public class StockManagerService
-    {
-        private IStockRepository _repository;
-        private IOrgRepository _orgRepository;
-        private AuthoriseFactory _factory;
-
-        public StockManagerService(IStockRepository repository,
-            IOrgRepository orgRepository, AuthoriseFactory service)
-        {
-            _repository = repository;
-            _orgRepository = orgRepository;
-            _factory = service;
-        }
-
-        /// <summary>
-        /// 根据部门ID得到进出库信息
-        /// </summary>
-        public dynamic Load(string username, string orgId, int pageindex, int pagesize)
-        {
-
-            var  service = _factory.Create(username);
-            if (service.Orgs.Count == 0) //用户没有任何可见机构
-            {
-                return new
-                {
-                    total = 0,
-                    records = 0,
-                    page = pageindex
-                };
-            }
-
-            var orgIds = service.Orgs.Select(u => u.Id).ToArray();  //用户可访问的机构ID
-
-            var orgs = _orgRepository.GetSubOrgs(orgId)   //点击的节点与用户可访问的机构合并
-                .Where(u => orgIds.Contains(u.Id))
-                .Select(u => u.Id).ToArray();
-
-            var keys = service.Resources.Select(r => r.Key);    //用户可访问的资源的KEY列表
-
-            Expression<Func<Stock, bool>> exp = u => u.OrgId != null &&orgs.Contains(u.OrgId) && (u.Viewable == "" || keys.Contains(u.Viewable));
-            var stocks = _repository.Find(pageindex, pagesize, "", exp);
-            int total = _repository.GetCount(exp);
-
-
-            return new
-            {
-                records = total,
-                total = (int)Math.Ceiling((double)total / pagesize),
-                rows = stocks,
-                page = pageindex
-            };
-        }
-
-        public Stock Find(string id)
-        {
-            var stock = _repository.FindSingle(u => u.Id == id);
-            if (stock == null) return new Stock();
-
-            return stock;
-        }
-
-        public void Delete(string[] id)
-        {
-            _repository.Delete(u =>id.Contains(u.Id));
-        }
-
-        public void AddOrUpdate(Stock stock)
-        {
-
-            if (string.IsNullOrEmpty(stock.Id))
-            {
-                _repository.Add(stock);
-            }
-            else
-            {
-                _repository.Update(stock);
-            }
-
-        }
-    }
-}
diff --git a/OpenAuth.Domain/Service/SystemAuthService.cs b/OpenAuth.Domain/Service/SystemAuthService.cs
index d5ed694e..5265bd89 100644
--- a/OpenAuth.Domain/Service/SystemAuthService.cs
+++ b/OpenAuth.Domain/Service/SystemAuthService.cs
@@ -1,58 +1,58 @@
-// ***********************************************************************
-// Assembly         : OpenAuth.Domain
-// Author           : yubaolee
-// Created          : 04-21-2016
-//
-// Last Modified By : yubaolee
-// Last Modified On : 04-21-2016
-// Contact : Microsoft
-// File: AuthenService.cs
-// ***********************************************************************
-
-using OpenAuth.Domain.Interface;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenAuth.Domain.Service
-{
-    /// <summary>
-    /// 领域服务
-    /// <para>超级管理员权限</para>
-    /// </summary>
-    public class SystemAuthService : AuthoriseService
-    {
-        public SystemAuthService(IUnitWork unitWork):base(unitWork)
-        {
-            _user = new User { Account = "System", Id = string.Empty };
-        }
-
-       
-
-        public override IQueryable<Org> GetOrgsQuery()
-        {
-            return _unitWork.Find<Org>(null);
-        }
-
-        public override IQueryable<Resource> GetResourcesQuery()
-        {
-            return _unitWork.Find<Resource>(null);
-        }
-
-        public override IQueryable<ModuleElement> GetModuleElementsQuery()
-        {
-            return _unitWork.Find<ModuleElement>(null);
-        }
-
-        public override IQueryable<Module> GetModulesQuery()
-        {
-            return _unitWork.Find<Module>(null);
-        }
-
-        public override IQueryable<Role> GetRolesQuery()
-        {
-            //用户角色
-            return _unitWork.Find<Role>(null);
-        }
-    }
+// ***********************************************************************
+// Assembly         : OpenAuth.Domain
+// Author           : yubaolee
+// Created          : 04-21-2016
+//
+// Last Modified By : yubaolee
+// Last Modified On : 04-21-2016
+// Contact : Microsoft
+// File: AuthenService.cs
+// ***********************************************************************
+
+using OpenAuth.Domain.Interface;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenAuth.Domain.Service
+{
+    /// <summary>
+    /// 领域服务
+    /// <para>超级管理员权限</para>
+    /// </summary>
+    public class SystemAuthService : AuthoriseService
+    {
+        public SystemAuthService(IUnitWork unitWork):base(unitWork)
+        {
+            _user = new User { Account = "System", Id = string.Empty };
+        }
+
+       
+
+        public override IQueryable<Org> GetOrgsQuery()
+        {
+            return _unitWork.Find<Org>(null);
+        }
+
+        public override IQueryable<Resource> GetResourcesQuery()
+        {
+            return _unitWork.Find<Resource>(null);
+        }
+
+        public override IQueryable<ModuleElement> GetModuleElementsQuery()
+        {
+            return _unitWork.Find<ModuleElement>(null);
+        }
+
+        public override IQueryable<Module> GetModulesQuery()
+        {
+            return _unitWork.Find<Module>(null);
+        }
+
+        public override IQueryable<Role> GetRolesQuery()
+        {
+            //用户角色
+            return _unitWork.Find<Role>(null);
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FileController.cs b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FileController.cs
index 12c29dcb..2f0cd064 100644
--- a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FileController.cs
+++ b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FileController.cs
@@ -14,6 +14,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
         [HttpPost]
         public string Add(HttpPostedFileBase Filedata)
         {
+            var response = new Response<string>();
             if (Filedata != null && Filedata.ContentLength > 0 && Filedata.ContentLength < 10485760)
             {
                 using (var binaryReader = new BinaryReader(Filedata.InputStream))
@@ -21,16 +22,16 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
                     var fileName = Path.GetFileName(Filedata.FileName);
                     var data = binaryReader.ReadBytes(Filedata.ContentLength);
                     var result = UploadFile(fileName, data, string.Empty);
-                    Result.Result = result;
+                    response.Result = result;
                 }
             }
             else
             {
-                Result.Message = "文件过大";
-                Result.Status = false;
+                 response.Message = "文件过大";
+                 response.Code = 500;
             }
 
-            return JsonHelper.Instance.Serialize(Result);
+            return JsonHelper.Instance.Serialize(response);
 
         }
 
diff --git a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowInstancesController.cs b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowInstancesController.cs
index 40f7037c..c65269d6 100644
--- a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowInstancesController.cs
+++ b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowInstancesController.cs
@@ -143,7 +143,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
             }
             catch (Exception e)
             {
-                Result.Status = false;
+                 Result.Code = 500;
                 Result.Message = e.Message;
                 return Result.ToJson();
             }
diff --git a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs
index f49740a9..cab80eb0 100644
--- a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs
+++ b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs
@@ -119,7 +119,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
             }
             catch (Exception e)
             {
-                Result.Status = false;
+                 Result.Code = 500;
                 Result.Message = e.Message;
             }
             return Result.ToJson();
diff --git a/OpenAuth.Mvc/AutofacExt.cs b/OpenAuth.Mvc/AutofacExt.cs
index 9ca8f6fc..0cc4e3fc 100644
--- a/OpenAuth.Mvc/AutofacExt.cs
+++ b/OpenAuth.Mvc/AutofacExt.cs
@@ -45,7 +45,7 @@ namespace OpenAuth.Mvc
                 || u.Namespace == "OpenAuth.Domain.Interface");
 
             //注册Repository
-            builder.RegisterAssemblyTypes(Assembly.GetAssembly(typeof(UserRepository)))
+            builder.RegisterAssemblyTypes(Assembly.GetAssembly(typeof(UserManagerApp)))
                 .AsImplementedInterfaces();
 
             // 注册controller，使用属性注入
diff --git a/OpenAuth.Mvc/Controllers/CategoryManagerController.cs b/OpenAuth.Mvc/Controllers/CategoryManagerController.cs
index 0480ac13..5f4d05a1 100644
--- a/OpenAuth.Mvc/Controllers/CategoryManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/CategoryManagerController.cs
@@ -44,7 +44,7 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                Result.Status = false;
+                Result.Code = 500;
                 Result.Message = ex.Message;
             }
             return JsonHelper.Instance.Serialize(Result);
@@ -58,7 +58,7 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                 Result.Status = false;
+                  Result.Code = 500;
                 Result.Message = e.Message;
             }
 
diff --git a/OpenAuth.Mvc/Controllers/ErrorController.cs b/OpenAuth.Mvc/Controllers/ErrorController.cs
index b2f1690d..207f7f86 100644
--- a/OpenAuth.Mvc/Controllers/ErrorController.cs
+++ b/OpenAuth.Mvc/Controllers/ErrorController.cs
@@ -24,7 +24,7 @@ namespace OpenAuth.Mvc.Controllers
             Response.Charset = "utf-8";
             var response = new Response
             {
-                Status = false,
+                Code = 500,
                 Message = "演示版本，不能进行此操作"
             };
             return JsonHelper.Instance.Serialize(response);
diff --git a/OpenAuth.Mvc/Controllers/LoginController.cs b/OpenAuth.Mvc/Controllers/LoginController.cs
index b2152e4e..f3744fda 100644
--- a/OpenAuth.Mvc/Controllers/LoginController.cs
+++ b/OpenAuth.Mvc/Controllers/LoginController.cs
@@ -20,12 +20,11 @@ namespace OpenAuth.Mvc.Controllers
         [HttpPost]
         public string Index(string username, string password)
         {
-            var resp = new Response();
+            var resp = new LoginResult();
             try
             {
                 var result = AuthUtil.Login(_appKey, username, password);
-                resp.Status = result.Success;
-                if (result.Success)
+                if (result.Code ==200)
                 {
                     resp.Result = "/home/index?Token=" + result.Token;
                 }
@@ -36,7 +35,7 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                resp.Status = false;
+                resp.Code = 500;
                 resp.Message = e.Message;
             }
             return JsonHelper.Instance.Serialize(resp);
@@ -50,7 +49,7 @@ namespace OpenAuth.Mvc.Controllers
             try
             {
                 var result = AuthUtil.Login(_appKey, "System","123456");
-                if (result.Success)
+                if (result.Code ==200)
                     return Redirect("/home/index?Token=" + result.Token);
                 else
                 {
diff --git a/OpenAuth.Mvc/Controllers/ModuleElementManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleElementManagerController.cs
deleted file mode 100644
index 9ac21f8f..00000000
--- a/OpenAuth.Mvc/Controllers/ModuleElementManagerController.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// ***********************************************************************
-// Assembly         : OpenAuth.Mvc
-// Author           : Yubao Li
-// Created          : 12-02-2015
-//
-// Last Modified By : Yubao Li
-// Last Modified On : 12-02-2015
-// ***********************************************************************
-// <copyright file="ModuleElementManagerController.cs" company="">
-//     Copyright (c) . All rights reserved.
-// </copyright>
-// <summary>模块元素管理，无需权限控制</summary>
-// ***********************************************************************
-
-using Infrastructure;
-using OpenAuth.App;
-using OpenAuth.Domain;
-using OpenAuth.Mvc.Models;
-using System;
-using System.Data.Entity.Validation;
-using System.Web.Mvc;
-
-namespace OpenAuth.Mvc.Controllers
-{
-    public class ModuleElementManagerController : BaseController
-    {
-        public ModuleElementManagerApp App { get; set; }
-
-        public ActionResult Index(string id)
-        {
-            ViewBag.ModuleId = id;
-            return View();
-        }
-        public ActionResult Get(string moduleId)
-        {
-            return Json(App.LoadByModuleId(moduleId), JsonRequestBehavior.AllowGet);
-        }
-        [HttpPost]
-        public string AddOrEditButton(ModuleElement button)
-        {
-            try
-            {
-                App.AddOrUpdate(button);
-            }
-            catch (DbEntityValidationException e)
-            {
-                
-                 Result.Status=false;
-                 Result.Message = e.Message;
-            }
-            return JsonHelper.Instance.Serialize( Result);
-        }
-        public string Del(string[] ids)
-        {
-            try
-            {
-                App.Delete(ids);
-            }
-            catch (Exception e)
-            {
-                 Result.Status=false;
-                 Result.Message = e.Message;
-            }
-            return JsonHelper.Instance.Serialize( Result);
-        }
-
-        /// <summary>
-        /// 分配模块菜单（按钮）界面
-        /// <para>可以为用户/角色分配，同过key（UserElement/RoleElement）区分</para>
-        /// </summary>
-        /// <param name="firstId">The first identifier.</param>
-        /// <param name="key">The key.</param>
-        /// <returns>ActionResult.</returns>
-        public ActionResult AssignModuleElement(string firstId, string key)
-        {
-            ViewBag.FirstId = firstId;
-            ViewBag.ModuleType = key;
-            return View();
-        }
-        public string LoadWithAccess(string tId, string firstId, string key)
-        {
-            return JsonHelper.Instance.Serialize(App.LoadWithAccess(key, firstId, tId));
-        }
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
index 29221d9a..524c7e9f 100644
--- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
@@ -137,7 +137,7 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                Result.Status = false;
+                Result.Code = 500;
                 Result.Message = ex.Message;
             }
             return JsonHelper.Instance.Serialize(Result);
@@ -155,7 +155,7 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                Result.Status = false;
+                Result.Code = 500;
                 Result.Message = e.Message;
             }
 
diff --git a/OpenAuth.Mvc/Controllers/OrgManagerController.cs b/OpenAuth.Mvc/Controllers/OrgManagerController.cs
index 642157e0..c6a7c4d1 100644
--- a/OpenAuth.Mvc/Controllers/OrgManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/OrgManagerController.cs
@@ -48,7 +48,7 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                 Result.Status = false;
+                  Result.Code = 500;
                 Result.Message = ex.Message;
             }
             return JsonHelper.Instance.Serialize(Result);
@@ -73,7 +73,7 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                 Result.Status = false;
+                  Result.Code = 500;
                 Result.Message = e.Message;
             }
 
diff --git a/OpenAuth.Mvc/Controllers/RelevanceManagerController.cs b/OpenAuth.Mvc/Controllers/RelevanceManagerController.cs
index ee3c7362..3a00d82b 100644
--- a/OpenAuth.Mvc/Controllers/RelevanceManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/RelevanceManagerController.cs
@@ -23,7 +23,7 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                 Result.Status = false;
+                  Result.Code = 500;
                 Result.Message = ex.Message;
             }
             return JsonHelper.Instance.Serialize(Result);
@@ -37,7 +37,7 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                 Result.Status = false;
+                  Result.Code = 500;
                 Result.Message = ex.Message;
             }
             return JsonHelper.Instance.Serialize(Result);
diff --git a/OpenAuth.Mvc/Controllers/ResourceManagerController.cs b/OpenAuth.Mvc/Controllers/ResourceManagerController.cs
deleted file mode 100644
index f27d7abc..00000000
--- a/OpenAuth.Mvc/Controllers/ResourceManagerController.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using Infrastructure;
-using OpenAuth.App;
-using OpenAuth.Domain;
-using System;
-using System.Linq;
-using System.Web.Mvc;
-using OpenAuth.App.SSO;
-using OpenAuth.Mvc.Models;
-
-namespace OpenAuth.Mvc.Controllers
-{
-    public class ResourceManagerController : BaseController
-    {
-        public ResourceManagerApp App { get; set; }
-
-        //
-        // GET: /UserManager/
-        [Authenticate]
-        public ActionResult Index()
-        {
-            return View();
-        }
-
-        //添加或修改Resource
-        [HttpPost]
-        public string Add(Resource model)
-        {
-            try
-            {
-                App.AddOrUpdate(model);
-            }
-            catch (Exception ex)
-            {
-                 Result.Status = false;
-                Result.Message = ex.Message;
-            }
-            return JsonHelper.Instance.Serialize(Result);
-        }
-
-        /// <summary>
-        /// 加载某分类的所有Resources
-        /// </summary>
-        public string Load(string categoryId, int page = 1, int rows = 30)
-        {
-            return JsonHelper.Instance.Serialize(App.Load(AuthUtil.GetUserName(), categoryId, page, rows));
-        }
-
-        public string LoadForTree()
-        {
-            var models = App.LoadAll();
-            return JsonHelper.Instance.Serialize(models);
-        }
-
-        [HttpPost]
-        public string Delete(string[] ids)
-        {
-            try
-            {
-                App.Delete(ids);
-            }
-            catch (Exception e)
-            {
-                 Result.Status = false;
-                Result.Message = e.Message;
-            }
-
-            return JsonHelper.Instance.Serialize(Result);
-        }
-
-        /// <summary>
-        /// 为用户或角色分配权限
-        /// </summary>
-        /// <param name="firstId">关联表中的firstId.</param>
-        /// <param name="key">关联表中的Key
-        /// <para>如：UserResource/RoleResource</para>
-        /// </param>
-        /// <returns>ActionResult.</returns>
-        public ActionResult AssignRes(string firstId, string key)
-        {
-            ViewBag.FirstId = firstId;
-            ViewBag.ModuleType = key;
-            return View();
-        }
-
-        /// <summary>
-        /// 加载带有授权的资源信息
-        /// </summary>
-        /// <param name="cId">分类ID</param>
-        /// <param name="firstId">关联表中的firstId</param>
-        /// <param name="key">关联表中的key</param>
-        /// <returns>System.String.</returns>
-        public string LoadWithAccess(string cId, string firstId, string key)
-        {
-            return JsonHelper.Instance.Serialize(App.LoadWithAccess(AuthUtil.GetUserName(),key,firstId, cId));
-        }
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Mvc/Controllers/RoleManagerController.cs b/OpenAuth.Mvc/Controllers/RoleManagerController.cs
deleted file mode 100644
index 25d08116..00000000
--- a/OpenAuth.Mvc/Controllers/RoleManagerController.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using Infrastructure;
-using OpenAuth.App;
-using System;
-using System.Web.Http;
-using System.Web.Mvc;
-using Newtonsoft.Json.Linq;
-using OpenAuth.Mvc.Models;
-
-namespace OpenAuth.Mvc.Controllers
-{
-    public class RoleManagerController : BaseController
-    {
-        public RoleManagerApp App { get; set; }
-
-        //
-        // GET: /RoleManager/
-        [Authenticate]
-        public ActionResult Index()
-        {
-            return View();
-        }
-
-        //添加或修改角色
-        [System.Web.Mvc.HttpPost]
-        public string Add([FromBody]JObject obj)
-        {
-            try
-            {
-                App.AddOrUpdate(obj);
-            }
-            catch (Exception ex)
-            {
-                 Result.Status = false;
-                Result.Message = ex.Message;
-            }
-            return JsonHelper.Instance.Serialize(Result);
-        }
-
-        /// <summary>
-        /// 加载角色下面的所有用户
-        /// </summary>
-        public string Load(string orgId, int pageCurrent = 1, int pageSize = 30)
-        {
-            return JsonHelper.Instance.Serialize(App.Load(orgId, pageCurrent, pageSize));
-        }
-
-        [System.Web.Mvc.HttpPost]
-        public string Delete(string[] ids)
-        {
-            try
-            {
-                foreach (var obj in ids)
-                {
-                    App.Delete(obj);
-                }
-            }
-            catch (Exception e)
-            {
-                 Result.Status = false;
-                Result.Message = e.Message;
-            }
-
-            return JsonHelper.Instance.Serialize(Result);
-        }
-
-        #region 为用户设置角色界面
-        public ActionResult LookupMulti(string firstId, string key)
-        {
-            ViewBag.FirstId = firstId;
-            ViewBag.ModuleType = key;
-            return View();
-        }
-
-        public string LoadForOrgAndUser(string orgId, string userId)
-        {
-            return JsonHelper.Instance.Serialize(App.LoadForOrgAndUser(orgId, userId));
-        }
-
-        #endregion 为用户设置角色界面
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Mvc/Controllers/StockManagerController.cs b/OpenAuth.Mvc/Controllers/StockManagerController.cs
deleted file mode 100644
index 13b7a102..00000000
--- a/OpenAuth.Mvc/Controllers/StockManagerController.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using Infrastructure;
-using OpenAuth.App;
-using OpenAuth.Domain;
-using System;
-using System.Web.Mvc;
-using OpenAuth.App.SSO;
-using OpenAuth.Mvc.Models;
-
-namespace OpenAuth.Mvc.Controllers
-{
-    /// <summary>
-    /// 进出库管理
-    /// <para>本示例主要演示如何使用用户拥有的机构/资源</para>
-    /// </summary>
-    public class StockManagerController : BaseController
-    {
-        public StockManagerApp App { get; set; }
-
-        //
-        // GET: /UserManager/
-        [Authenticate]
-        public ActionResult Index()
-        {
-            return View();
-        }
-
-        //添加或修改Stock
-        [HttpPost]
-        public string Add(Stock model)
-        {
-            try
-            {
-               var newmodel =  new Stock();
-                model.CopyTo(newmodel);
-                App.AddOrUpdate(newmodel);
-            }
-            catch (Exception ex)
-            {
-                 Result.Status = false;
-                Result.Message = ex.Message;
-            }
-            return JsonHelper.Instance.Serialize(Result);
-        }
-
-        /// <summary>
-        /// 加载节点下面的所有Stocks
-        /// </summary>
-        public string Load(string parentId, int page = 1, int rows = 30)
-        {
-            return JsonHelper.Instance.Serialize(App.Load(AuthUtil.GetUserName(), parentId, page, rows));
-        }
-        
-        public string Delete(string[] ids)
-        {
-            try
-            {
-                App.Delete(ids);
-            }
-            catch (Exception e)
-            {
-                 Result.Status = false;
-                Result.Message = e.Message;
-            }
-
-            return JsonHelper.Instance.Serialize(Result);
-        }
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Mvc/Controllers/UserManagerController.cs b/OpenAuth.Mvc/Controllers/UserManagerController.cs
index c64a7663..8b8709d9 100644
--- a/OpenAuth.Mvc/Controllers/UserManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/UserManagerController.cs
@@ -33,7 +33,7 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                 Result.Status = false;
+                  Result.Code = 500;
                 Result.Message = ex.Message;
             }
             return JsonHelper.Instance.Serialize(Result);
@@ -56,7 +56,7 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                 Result.Status = false;
+                  Result.Code = 500;
                 Result.Message = e.Message;
             }
 
diff --git a/OpenAuth.Mvc/Controllers/UserSessionController.cs b/OpenAuth.Mvc/Controllers/UserSessionController.cs
index d38ee5e9..6064b0b6 100644
--- a/OpenAuth.Mvc/Controllers/UserSessionController.cs
+++ b/OpenAuth.Mvc/Controllers/UserSessionController.cs
@@ -30,10 +30,8 @@ namespace OpenAuth.Mvc.Controllers
             }
             var data = new GridData
             {
-                page = 1,
                 data = query,
                 count = query.Count(),
-                total = 1
             };
             return JsonHelper.Instance.Serialize(data);
         }
diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
index d0b73579..1eb4e67d 100644
--- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj
+++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
@@ -153,13 +153,9 @@
     <Compile Include="Areas\FlowManage\Controllers\FlowInstancesController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\LoginController.cs" />
-    <Compile Include="Controllers\ModuleElementManagerController.cs" />
     <Compile Include="Controllers\ModuleManagerController.cs" />
     <Compile Include="Controllers\OrgManagerController.cs" />
     <Compile Include="Controllers\RelevanceManagerController.cs" />
-    <Compile Include="Controllers\ResourceManagerController.cs" />
-    <Compile Include="Controllers\RoleManagerController.cs" />
-    <Compile Include="Controllers\StockManagerController.cs" />
     <Compile Include="Controllers\UserManagerController.cs" />
     <Compile Include="Controllers\UserSessionController.cs" />
     <Compile Include="Models\JobjectModelBinder.cs" />
@@ -396,10 +392,6 @@
       <Project>{0bbf2d65-fffd-4272-b138-8ea4fb6fec48}</Project>
       <Name>OpenAuth.App</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OpenAuth.Domain\OpenAuth.Domain.csproj">
-      <Project>{6108da8e-92a1-4abe-b9f5-26d64d55ca2c}</Project>
-      <Name>OpenAuth.Domain</Name>
-    </ProjectReference>
     <ProjectReference Include="..\OpenAuth.Repository\OpenAuth.Repository.csproj">
       <Project>{e8df8dea-e2cf-4bdb-8f4f-3f8205b0e03a}</Project>
       <Name>OpenAuth.Repository</Name>
diff --git a/OpenAuth.Mvc/Views/Home/Index.cshtml b/OpenAuth.Mvc/Views/Home/Index.cshtml
index e7738c6c..320c1157 100644
--- a/OpenAuth.Mvc/Views/Home/Index.cshtml
+++ b/OpenAuth.Mvc/Views/Home/Index.cshtml
@@ -128,6 +128,6 @@ tpwidget("init", {
 
     <script type="text/javascript" src="/layui/layui.js"></script>
     <script type="text/javascript" src="/js/leftNav.js"></script>
-    <script type="text/javascript" src="/js/index.js"></script>
+    <script type="text/javascript" src="/js/index.js?v=1"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/OpenAuth.Mvc/js/index.js b/OpenAuth.Mvc/js/index.js
index 35b4de07..9858093a 100644
--- a/OpenAuth.Mvc/js/index.js
+++ b/OpenAuth.Mvc/js/index.js
@@ -14,14 +14,16 @@ layui.config({
 	//更换皮肤
 	function skins(){
 		var skin = window.sessionStorage.getItem("skin");
-		if(skin){  //如果更换过皮肤
-			if(window.sessionStorage.getItem("skinValue") != "自定义"){
-				$("body").addClass(window.sessionStorage.getItem("skin"));
-			}else{
-				$(".layui-layout-admin .layui-header").css("background-color",skin.split(',')[0]);
-				$(".layui-bg-black").css("background-color",skin.split(',')[1]);
-				$(".hideMenu").css("background-color",skin.split(',')[2]);
-			}
+		if (skin) { //如果更换过皮肤
+		    if (window.sessionStorage.getItem("skinValue") != "自定义") {
+		        $("body").addClass(window.sessionStorage.getItem("skin"));
+		    } else {
+		        $(".layui-layout-admin .layui-header").css("background-color", skin.split(',')[0]);
+		        $(".layui-bg-black").css("background-color", skin.split(',')[1]);
+		        $(".hideMenu").css("background-color", skin.split(',')[2]);
+		    }
+		} else {
+		    $("body").addClass("blue");
 		}
 	}
 	skins();
diff --git a/OpenAuth.Repository/CategoryRepository.cs b/OpenAuth.Repository/CategoryRepository.cs
deleted file mode 100644
index 2722842a..00000000
--- a/OpenAuth.Repository/CategoryRepository.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-
-namespace OpenAuth.Repository
-{
-    public class CategoryRepository :BaseRepository<Category>, ICategoryRepository
-    {
-
-        public IEnumerable<Category> LoadCategorys(int pageindex, int pagesize)
-        {
-            return Context.Categories.OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize);
-        }
-
-        public IEnumerable<Category> LoadInOrgs(params string[] orgId)
-        {
-            var result = from category in Context.Categories where orgId.Contains(category.Id)
-                select category;
-            return result;
-
-        }
-
-        public int GetCategoryCntInOrgs(params string[] orgIds)
-        {
-            return LoadInOrgs(orgIds).Count();
-        }
-
-        public IEnumerable<Category> LoadInOrgs(int pageindex, int pagesize, params string[] orgIds)
-        {
-            return LoadInOrgs(orgIds).OrderBy(u =>u.Id).Skip((pageindex -1)*pagesize).Take(pagesize);
-        }
-
-        public void Delete(string id)
-        {
-            Delete(u =>u.Id == id);
-        }
-
-        /// <summary>
-        /// 获取当前节点的所有下级节点
-        /// </summary>
-        public string[] GetSubIds(string orgId)
-        {
-            if (orgId == string.Empty)
-            {
-                return Find(null).Select(u => u.Id).ToArray();
-            }
-            var org = FindSingle(u => u.Id == orgId);
-            var ids = Find(u => u.CascadeId.Contains(org.CascadeId)).Select(u => u.Id).ToArray();
-            return ids;
-        }
-    }
-}
diff --git a/OpenAuth.Domain/Core/Application.cs b/OpenAuth.Repository/Domain/Application.cs
similarity index 100%
rename from OpenAuth.Domain/Core/Application.cs
rename to OpenAuth.Repository/Domain/Application.cs
diff --git a/OpenAuth.Domain/Core/Category.cs b/OpenAuth.Repository/Domain/Category.cs
similarity index 100%
rename from OpenAuth.Domain/Core/Category.cs
rename to OpenAuth.Repository/Domain/Category.cs
diff --git a/OpenAuth.Domain/Core/CategoryType.cs b/OpenAuth.Repository/Domain/CategoryType.cs
similarity index 100%
rename from OpenAuth.Domain/Core/CategoryType.cs
rename to OpenAuth.Repository/Domain/CategoryType.cs
diff --git a/OpenAuth.Domain/Core/Entity.cs b/OpenAuth.Repository/Domain/Entity.cs
similarity index 100%
rename from OpenAuth.Domain/Core/Entity.cs
rename to OpenAuth.Repository/Domain/Entity.cs
diff --git a/OpenAuth.Domain/Core/Module.cs b/OpenAuth.Repository/Domain/Module.cs
similarity index 100%
rename from OpenAuth.Domain/Core/Module.cs
rename to OpenAuth.Repository/Domain/Module.cs
diff --git a/OpenAuth.Domain/Core/ModuleElement.cs b/OpenAuth.Repository/Domain/ModuleElement.cs
similarity index 100%
rename from OpenAuth.Domain/Core/ModuleElement.cs
rename to OpenAuth.Repository/Domain/ModuleElement.cs
diff --git a/OpenAuth.Domain/Core/Org.cs b/OpenAuth.Repository/Domain/Org.cs
similarity index 100%
rename from OpenAuth.Domain/Core/Org.cs
rename to OpenAuth.Repository/Domain/Org.cs
diff --git a/OpenAuth.Domain/Core/Relevance.cs b/OpenAuth.Repository/Domain/Relevance.cs
similarity index 100%
rename from OpenAuth.Domain/Core/Relevance.cs
rename to OpenAuth.Repository/Domain/Relevance.cs
diff --git a/OpenAuth.Domain/Core/Resource.cs b/OpenAuth.Repository/Domain/Resource.cs
similarity index 100%
rename from OpenAuth.Domain/Core/Resource.cs
rename to OpenAuth.Repository/Domain/Resource.cs
diff --git a/OpenAuth.Domain/Core/Role.cs b/OpenAuth.Repository/Domain/Role.cs
similarity index 100%
rename from OpenAuth.Domain/Core/Role.cs
rename to OpenAuth.Repository/Domain/Role.cs
diff --git a/OpenAuth.Domain/Core/Stock.cs b/OpenAuth.Repository/Domain/Stock.cs
similarity index 100%
rename from OpenAuth.Domain/Core/Stock.cs
rename to OpenAuth.Repository/Domain/Stock.cs
diff --git a/OpenAuth.Domain/Core/User.cs b/OpenAuth.Repository/Domain/User.cs
similarity index 100%
rename from OpenAuth.Domain/Core/User.cs
rename to OpenAuth.Repository/Domain/User.cs
diff --git a/OpenAuth.Domain/Core/UserExt.cs b/OpenAuth.Repository/Domain/UserExt.cs
similarity index 100%
rename from OpenAuth.Domain/Core/UserExt.cs
rename to OpenAuth.Repository/Domain/UserExt.cs
diff --git a/OpenAuth.Domain/Core/WFFrmMain.cs b/OpenAuth.Repository/Domain/WFFrmMain.cs
similarity index 100%
rename from OpenAuth.Domain/Core/WFFrmMain.cs
rename to OpenAuth.Repository/Domain/WFFrmMain.cs
diff --git a/OpenAuth.Domain/Core/WFProcessInstance.cs b/OpenAuth.Repository/Domain/WFProcessInstance.cs
similarity index 100%
rename from OpenAuth.Domain/Core/WFProcessInstance.cs
rename to OpenAuth.Repository/Domain/WFProcessInstance.cs
diff --git a/OpenAuth.Domain/Core/WFProcessOperationHistory.cs b/OpenAuth.Repository/Domain/WFProcessOperationHistory.cs
similarity index 100%
rename from OpenAuth.Domain/Core/WFProcessOperationHistory.cs
rename to OpenAuth.Repository/Domain/WFProcessOperationHistory.cs
diff --git a/OpenAuth.Domain/Core/WFProcessScheme.cs b/OpenAuth.Repository/Domain/WFProcessScheme.cs
similarity index 100%
rename from OpenAuth.Domain/Core/WFProcessScheme.cs
rename to OpenAuth.Repository/Domain/WFProcessScheme.cs
diff --git a/OpenAuth.Domain/Core/WFProcessTransitionHistory.cs b/OpenAuth.Repository/Domain/WFProcessTransitionHistory.cs
similarity index 100%
rename from OpenAuth.Domain/Core/WFProcessTransitionHistory.cs
rename to OpenAuth.Repository/Domain/WFProcessTransitionHistory.cs
diff --git a/OpenAuth.Domain/Core/WFSchemeContent.cs b/OpenAuth.Repository/Domain/WFSchemeContent.cs
similarity index 100%
rename from OpenAuth.Domain/Core/WFSchemeContent.cs
rename to OpenAuth.Repository/Domain/WFSchemeContent.cs
diff --git a/OpenAuth.Domain/Core/WFSchemeInfo.cs b/OpenAuth.Repository/Domain/WFSchemeInfo.cs
similarity index 100%
rename from OpenAuth.Domain/Core/WFSchemeInfo.cs
rename to OpenAuth.Repository/Domain/WFSchemeInfo.cs
diff --git a/OpenAuth.Domain/Interface/IRepository.cs b/OpenAuth.Repository/Interface/IRepository.cs
similarity index 100%
rename from OpenAuth.Domain/Interface/IRepository.cs
rename to OpenAuth.Repository/Interface/IRepository.cs
diff --git a/OpenAuth.Domain/Interface/IUnitWork.cs b/OpenAuth.Repository/Interface/IUnitWork.cs
similarity index 100%
rename from OpenAuth.Domain/Interface/IUnitWork.cs
rename to OpenAuth.Repository/Interface/IUnitWork.cs
diff --git a/OpenAuth.Repository/Models/Mapping/ApplicationMap.cs b/OpenAuth.Repository/Mapping/ApplicationMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/ApplicationMap.cs
rename to OpenAuth.Repository/Mapping/ApplicationMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/CategoryMap.cs b/OpenAuth.Repository/Mapping/CategoryMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/CategoryMap.cs
rename to OpenAuth.Repository/Mapping/CategoryMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/CategoryTypeMap.cs b/OpenAuth.Repository/Mapping/CategoryTypeMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/CategoryTypeMap.cs
rename to OpenAuth.Repository/Mapping/CategoryTypeMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/ModuleElementMap.cs b/OpenAuth.Repository/Mapping/ModuleElementMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/ModuleElementMap.cs
rename to OpenAuth.Repository/Mapping/ModuleElementMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/ModuleMap.cs b/OpenAuth.Repository/Mapping/ModuleMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/ModuleMap.cs
rename to OpenAuth.Repository/Mapping/ModuleMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/OrgMap.cs b/OpenAuth.Repository/Mapping/OrgMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/OrgMap.cs
rename to OpenAuth.Repository/Mapping/OrgMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/RelevanceMap.cs b/OpenAuth.Repository/Mapping/RelevanceMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/RelevanceMap.cs
rename to OpenAuth.Repository/Mapping/RelevanceMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/ResourceMap.cs b/OpenAuth.Repository/Mapping/ResourceMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/ResourceMap.cs
rename to OpenAuth.Repository/Mapping/ResourceMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/RoleMap.cs b/OpenAuth.Repository/Mapping/RoleMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/RoleMap.cs
rename to OpenAuth.Repository/Mapping/RoleMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/StockMap.cs b/OpenAuth.Repository/Mapping/StockMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/StockMap.cs
rename to OpenAuth.Repository/Mapping/StockMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/UserMap.cs b/OpenAuth.Repository/Mapping/UserMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/UserMap.cs
rename to OpenAuth.Repository/Mapping/UserMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/WFFrmMainMap.cs b/OpenAuth.Repository/Mapping/WFFrmMainMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/WFFrmMainMap.cs
rename to OpenAuth.Repository/Mapping/WFFrmMainMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/WFProcessInstanceMap.cs b/OpenAuth.Repository/Mapping/WFProcessInstanceMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/WFProcessInstanceMap.cs
rename to OpenAuth.Repository/Mapping/WFProcessInstanceMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/WFProcessOperationHistoryMap.cs b/OpenAuth.Repository/Mapping/WFProcessOperationHistoryMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/WFProcessOperationHistoryMap.cs
rename to OpenAuth.Repository/Mapping/WFProcessOperationHistoryMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/WFProcessSchemeMap.cs b/OpenAuth.Repository/Mapping/WFProcessSchemeMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/WFProcessSchemeMap.cs
rename to OpenAuth.Repository/Mapping/WFProcessSchemeMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/WFProcessTransitionHistoryMap.cs b/OpenAuth.Repository/Mapping/WFProcessTransitionHistoryMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/WFProcessTransitionHistoryMap.cs
rename to OpenAuth.Repository/Mapping/WFProcessTransitionHistoryMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/WFSchemeContentMap.cs b/OpenAuth.Repository/Mapping/WFSchemeContentMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/WFSchemeContentMap.cs
rename to OpenAuth.Repository/Mapping/WFSchemeContentMap.cs
diff --git a/OpenAuth.Repository/Models/Mapping/WFSchemeInfoMap.cs b/OpenAuth.Repository/Mapping/WFSchemeInfoMap.cs
similarity index 100%
rename from OpenAuth.Repository/Models/Mapping/WFSchemeInfoMap.cs
rename to OpenAuth.Repository/Mapping/WFSchemeInfoMap.cs
diff --git a/OpenAuth.Repository/ModuleRepository.cs b/OpenAuth.Repository/ModuleRepository.cs
deleted file mode 100644
index 09aedac6..00000000
--- a/OpenAuth.Repository/ModuleRepository.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-
-namespace OpenAuth.Repository
-{
-    public class ModuleRepository :BaseRepository<Module>, IModuleRepository
-    {
-        public IEnumerable<Module> LoadModules(int pageindex, int pagesize)
-        {
-            return Context.Modules.OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize);
-        }
-
-        public int GetRoleCntInOrgs(params string[] orgIds)
-        {
-            return LoadInOrgs(orgIds).Count();
-        }
-
-        public int GetModuleCntInOrgs(params string[] orgIds)
-        {
-            return LoadInOrgs(orgIds).Count();
-        }
-
-
-        public IEnumerable<Module> LoadInOrgs(int pageindex, int pagesize, params string[] orgIds)
-        {
-            return LoadInOrgs(orgIds).OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize);
-        }
-
-        public void Delete(string id)
-        {
-            Delete(u =>u.Id == id);
-        }
-
-        public IEnumerable<Module> LoadInOrgs(params string[] orgId)
-        {
-            var result = from role in Context.Modules.Where(u =>u.ParentId != null && orgId.Contains(u.ParentId)) select role;
-                        
-            return result;
-
-        }
-    }
-}
diff --git a/OpenAuth.Repository/OpenAuth.Repository.csproj b/OpenAuth.Repository/OpenAuth.Repository.csproj
index 0ca0b77f..b37d97fd 100644
--- a/OpenAuth.Repository/OpenAuth.Repository.csproj
+++ b/OpenAuth.Repository/OpenAuth.Repository.csproj
@@ -55,46 +55,56 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Models\Mapping\ApplicationMap.cs" />
-    <Compile Include="Models\Mapping\CategoryTypeMap.cs" />
-    <Compile Include="Models\Mapping\WFFrmMainMap.cs" />
-    <Compile Include="Models\Mapping\WFProcessInstanceMap.cs" />
-    <Compile Include="Models\Mapping\WFProcessOperationHistoryMap.cs" />
-    <Compile Include="Models\Mapping\WFProcessSchemeMap.cs" />
-    <Compile Include="Models\Mapping\WFProcessTransitionHistoryMap.cs" />
-    <Compile Include="Models\Mapping\WFSchemeContentMap.cs" />
-    <Compile Include="Models\Mapping\WFSchemeInfoMap.cs" />
+    <Compile Include="Domain\Application.cs" />
+    <Compile Include="Domain\Category.cs" />
+    <Compile Include="Domain\CategoryType.cs" />
+    <Compile Include="Domain\Entity.cs" />
+    <Compile Include="Domain\Module.cs" />
+    <Compile Include="Domain\ModuleElement.cs" />
+    <Compile Include="Domain\Org.cs" />
+    <Compile Include="Domain\Relevance.cs" />
+    <Compile Include="Domain\Resource.cs" />
+    <Compile Include="Domain\Role.cs" />
+    <Compile Include="Domain\Stock.cs" />
+    <Compile Include="Domain\User.cs" />
+    <Compile Include="Domain\UserExt.cs" />
+    <Compile Include="Domain\WFFrmMain.cs" />
+    <Compile Include="Domain\WFProcessInstance.cs" />
+    <Compile Include="Domain\WFProcessOperationHistory.cs" />
+    <Compile Include="Domain\WFProcessScheme.cs" />
+    <Compile Include="Domain\WFProcessTransitionHistory.cs" />
+    <Compile Include="Domain\WFSchemeContent.cs" />
+    <Compile Include="Domain\WFSchemeInfo.cs" />
+    <Compile Include="Interface\IRepository.cs" />
+    <Compile Include="Interface\IUnitWork.cs" />
+    <Compile Include="Mapping\ApplicationMap.cs" />
+    <Compile Include="Mapping\CategoryTypeMap.cs" />
+    <Compile Include="Mapping\WFFrmMainMap.cs" />
+    <Compile Include="Mapping\WFProcessInstanceMap.cs" />
+    <Compile Include="Mapping\WFProcessOperationHistoryMap.cs" />
+    <Compile Include="Mapping\WFProcessSchemeMap.cs" />
+    <Compile Include="Mapping\WFProcessTransitionHistoryMap.cs" />
+    <Compile Include="Mapping\WFSchemeContentMap.cs" />
+    <Compile Include="Mapping\WFSchemeInfoMap.cs" />
     <Compile Include="UnitWork.cs" />
     <Compile Include="BaseRepository.cs" />
-    <Compile Include="Models\Mapping\CategoryMap.cs" />
-    <Compile Include="Models\Mapping\ModuleElementMap.cs" />
-    <Compile Include="Models\Mapping\ModuleMap.cs" />
-    <Compile Include="Models\Mapping\OrgMap.cs" />
-    <Compile Include="Models\Mapping\RelevanceMap.cs" />
-    <Compile Include="Models\Mapping\ResourceMap.cs" />
-    <Compile Include="Models\Mapping\RoleMap.cs" />
-    <Compile Include="Models\Mapping\StockMap.cs" />
-    <Compile Include="Models\Mapping\UserMap.cs" />
-    <Compile Include="Models\OpenAuthDBContext.cs" />
-    <Compile Include="OrgRepository.cs" />
+    <Compile Include="Mapping\CategoryMap.cs" />
+    <Compile Include="Mapping\ModuleElementMap.cs" />
+    <Compile Include="Mapping\ModuleMap.cs" />
+    <Compile Include="Mapping\OrgMap.cs" />
+    <Compile Include="Mapping\RelevanceMap.cs" />
+    <Compile Include="Mapping\ResourceMap.cs" />
+    <Compile Include="Mapping\RoleMap.cs" />
+    <Compile Include="Mapping\StockMap.cs" />
+    <Compile Include="Mapping\UserMap.cs" />
+    <Compile Include="OpenAuthDBContext.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ModuleRepository.cs" />
-    <Compile Include="RoleRepository.cs" />
-    <Compile Include="ResourceRepository.cs" />
-    <Compile Include="CategoryRepository.cs" />
-    <Compile Include="StockRepository.cs" />
-    <Compile Include="UserRepository.cs" />
-    <Compile Include="RelevanceRepository.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Infrastructure\Infrastructure.csproj">
       <Project>{5feaec9a-4f1e-4ee7-b377-9db1b0870dac}</Project>
       <Name>Infrastructure</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OpenAuth.Domain\OpenAuth.Domain.csproj">
-      <Project>{6108da8e-92a1-4abe-b9f5-26d64d55ca2c}</Project>
-      <Name>OpenAuth.Domain</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
diff --git a/OpenAuth.Repository/Models/OpenAuthDBContext.cs b/OpenAuth.Repository/OpenAuthDBContext.cs
similarity index 95%
rename from OpenAuth.Repository/Models/OpenAuthDBContext.cs
rename to OpenAuth.Repository/OpenAuthDBContext.cs
index b20042e3..a584a4ac 100644
--- a/OpenAuth.Repository/Models/OpenAuthDBContext.cs
+++ b/OpenAuth.Repository/OpenAuthDBContext.cs
@@ -6,13 +6,12 @@
 //     file will be lost if the code is regenerated.
 // </autogenerated>
 //------------------------------------------------------------------------------
-using System;
+
 using System.Data.Entity;
-using System.Collections.Generic;
 using OpenAuth.Domain;
 using OpenAuth.Repository.Models.Mapping;
 
-namespace OpenAuth.Repository.Models
+namespace OpenAuth.Repository
 {
     public partial class OpenAuthDBContext: DbContext
     {
diff --git a/OpenAuth.Repository/OrgRepository.cs b/OpenAuth.Repository/OrgRepository.cs
deleted file mode 100644
index 37d1560b..00000000
--- a/OpenAuth.Repository/OrgRepository.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-
-namespace OpenAuth.Repository
-{
-    public class OrgRepository : BaseRepository<Org>, IOrgRepository
-    {
-        public IEnumerable<Org> LoadOrgs()
-        {
-            return Find();
-        }
-
-        /// <summary>
-        /// 加载用户的所有机构
-        /// </summary>
-        public IEnumerable<Org> LoadByUser(string userId)
-        {
-            var result = from userorg in Context.Relevances
-                join org in Context.Orgs on userorg.SecondId equals org.Id
-                where userorg.FirstId == userId && userorg.Key =="UserOrg"
-                select org;
-            return result;
-
-        }
-
-        /// <summary>
-        /// 加载角色的所有机构
-        /// </summary>
-        public IEnumerable<Org> LoadByRole(string roleId)
-        {
-            var result = from userorg in Context.Relevances
-                         join org in Context.Orgs on userorg.SecondId equals org.Id
-                         where userorg.FirstId == roleId && userorg.Key == "RoleOrg"
-                         select org;
-            return result;
-
-        }
-
-        public IEnumerable<Org> GetSubOrgs(string orgId)
-        {
-            string cascadeId = "0.";
-            if (!string.IsNullOrEmpty(orgId))
-            {
-                var org = FindSingle(u => u.Id == orgId);
-                if (org == null)
-                    throw new Exception("未能找到指定对象信息");
-                cascadeId = org.CascadeId;
-            }
-
-            return Find(u => u.CascadeId.Contains(cascadeId));
-        }
-    }
-}
diff --git a/OpenAuth.Repository/RelevanceRepository.cs b/OpenAuth.Repository/RelevanceRepository.cs
deleted file mode 100644
index 99d4075a..00000000
--- a/OpenAuth.Repository/RelevanceRepository.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenAuth.Repository
-{
-    public class RelevanceRepository : BaseRepository<Relevance>, IRelevanceRepository
-    {
-        public void DeleteBy(string key, params string[] firstIds)
-        {
-            Delete(u => firstIds.Contains(u.FirstId) && u.Key == key);
-        }
-
-        /// <summary>
-        /// 删除关联
-        /// </summary>
-        /// <param name="key">关联标识</param>
-        /// <param name="idMaps">关联的&lt;firstId, secondId&gt;数组</param>
-        public void DeleteBy(string key, ILookup<string, string> idMaps)
-        {
-            foreach (var sameVals in idMaps)
-            {
-                foreach (var value in sameVals)
-                {
-                    Delete(u =>u.Key == key && u.FirstId == sameVals.Key && u.SecondId == value);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 添加新的关联
-        /// </summary>
-        /// <param name="key">关联标识</param>
-        /// <param name="idMaps">关联的&lt;firstId, secondId&gt;数组</param>
-        public void AddRelevance(string key, ILookup<string, string> idMaps)
-        {
-            DeleteBy(key, idMaps);
-            BatchAdd((from sameVals in idMaps
-                from value in sameVals
-                select new Relevance
-                {
-                    Key = key,
-                    FirstId = sameVals.Key,
-                    SecondId = value,
-                    OperateTime = DateTime.Now
-                }).ToArray());
-        }
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Repository/ResourceRepository.cs b/OpenAuth.Repository/ResourceRepository.cs
deleted file mode 100644
index 99febec3..00000000
--- a/OpenAuth.Repository/ResourceRepository.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OpenAuth.Repository
-{
-    public class ResourceRepository : BaseRepository<Resource>, IResourceRepository
-    {
-        public IEnumerable<Resource> LoadInOrgs(int pageindex, int pagesize, params string[] orgIds)
-        {
-            return LoadInOrgs(orgIds).OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize);
-        }
-
-        public void Delete(string id)
-        {
-            Delete(u => u.Id == id);
-        }
-
-        public IEnumerable<Resource> LoadInOrgs(params string[] orgId)
-        {
-            bool isZero = orgId.Length == 1 && orgId[0] == string.Empty;  //判断传进来的是否为0
-            var result = from resource in Context.Resources.Where(u =>isZero 
-                         || u.CascadeId != null &&orgId.Contains(u.CategoryId)) select resource;
-
-            return result;
-        }
-
-        public IEnumerable<Resource> LoadResources(int pageindex, int pagesize)
-        {
-            return Context.Resources.OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize);
-        }
-
-        public int GetResourceCntInOrgs(params string[] orgIds)
-        {
-            return LoadInOrgs(orgIds).Count();
-        }
-    }
-}
\ No newline at end of file
diff --git a/OpenAuth.Repository/RoleRepository.cs b/OpenAuth.Repository/RoleRepository.cs
deleted file mode 100644
index 64604952..00000000
--- a/OpenAuth.Repository/RoleRepository.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-
-namespace OpenAuth.Repository
-{
-    public class RoleRepository :BaseRepository<Role>, IRoleRepository
-    {
-        public IEnumerable<Role> LoadRoles(int pageindex, int pagesize)
-        {
-            return Context.Roles.OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize);
-        }
-
-        public int GetRoleCntInOrgs(params string[] orgIds)
-        {
-            return LoadInOrgs(orgIds).Count();
-        }
-
-        public IEnumerable<Role> LoadInOrgs(int pageindex, int pagesize, params string[] orgIds)
-        {
-            return LoadInOrgs(orgIds).OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize);
-        }
-
-        public void Delete(string id)
-        {
-            Delete(u =>u.Id == id);
-        }
-
-        public IEnumerable<Role> LoadInOrgs(params string[] orgId)
-        {
-            var roles = Context.Relevances.Where(u => u.Key == "RoleOrg"
-           && orgId.Contains(u.SecondId)).Select(u => u.FirstId);   //机构关联的角色
-
-            var result = from role in Context.Roles.Where(u =>roles.Contains(u.Id)) select role;
-                        
-            return result;
-
-        }
-
-        public IEnumerable<Role> LoadForUser(string userId)
-        {
-
-            if (userId == string.Empty)
-                return Find(null);
-
-            var userRoleIds =
-               Context.Relevances.Where(u => u.FirstId == userId && u.Key == "UserRole")
-               .Select(u => u.SecondId).ToList();
-
-            return Find(u => userRoleIds.Contains(u.Id));
-        }
-    }
-}
diff --git a/OpenAuth.Repository/StockRepository.cs b/OpenAuth.Repository/StockRepository.cs
deleted file mode 100644
index 084f62de..00000000
--- a/OpenAuth.Repository/StockRepository.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenAuth.Domain;
-using OpenAuth.Domain.Interface;
-
-namespace OpenAuth.Repository
-{
-    public class StockRepository :BaseRepository<Stock>, IStockRepository
-    {
-
-        public IEnumerable<Stock> LoadStocks(int pageindex, int pagesize)
-        {
-            return Context.Stocks.OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize);
-        }
-
-        public IEnumerable<Stock> LoadInOrgs(params string[] orgId)
-        {
-            var result = from stock in Context.Stocks where stock.OrgId != null && orgId.Contains(stock.OrgId)
-                select stock;
-            return result;
-
-        }
-
-        public int GetStockCntInOrgs(params string[] orgIds)
-        {
-            return LoadInOrgs(orgIds).Count();
-        }
-
-        public IEnumerable<Stock> LoadInOrgs(int pageindex, int pagesize, params string[] orgIds)
-        {
-            return LoadInOrgs(orgIds).OrderBy(u =>u.Id).Skip((pageindex -1)*pagesize).Take(pagesize);
-        }
-
-        public void Delete(string id)
-        {
-            Delete(u =>u.Id == id);
-        }
-    }
-}
diff --git a/OpenAuth.Repository/UserRepository.cs b/OpenAuth.Repository/UserRepository.cs
deleted file mode 100644
index 54492c3d..00000000
--- a/OpenAuth.Repository/UserRepository.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using OpenAuth.Domain.Interface;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Transactions;
-using EntityFramework.Extensions;
-using OpenAuth.Domain;
-
-
-namespace OpenAuth.Repository
-{
-    public class UserRepository :BaseRepository<User>, IUserRepository
-    {
-        public IEnumerable<User> LoadUsers(int pageindex, int pagesize)
-        {
-            return Context.Users.OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize);
-        }
-
-        public IEnumerable<User> LoadInOrgs(params string[] orgId)
-        {
-            var result = from user in Context.Users
-                     where (
-                         Context.Relevances.Where(uo => orgId.Contains(uo.SecondId) && uo.Key =="UserOrg")
-                         .Select(u => u.FirstId)
-                         .Distinct()
-                     )
-                     .Contains(user.Id)
-                select user;
-            return result;
-
-        }
-
-        public int GetUserCntInOrgs(params string[] orgIds)
-        {
-            return LoadInOrgs(orgIds).Count();
-        }
-
-        public IEnumerable<User> LoadInOrgs(int pageindex, int pagesize, params string[] orgIds)
-        {
-            return LoadInOrgs(orgIds).OrderBy(u =>u.Id).Skip((pageindex -1)*pagesize).Take(pagesize);
-        }
-
-    }
-}
diff --git a/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj b/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj
index f27450a7..85617b64 100644
--- a/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj
+++ b/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj
@@ -143,10 +143,6 @@
       <Project>{0BBF2D65-FFFD-4272-B138-8EA4FB6FEC48}</Project>
       <Name>OpenAuth.App</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OpenAuth.Domain\OpenAuth.Domain.csproj">
-      <Project>{6108DA8E-92A1-4ABE-B9F5-26D64D55CA2C}</Project>
-      <Name>OpenAuth.Domain</Name>
-    </ProjectReference>
     <ProjectReference Include="..\OpenAuth.Mvc\OpenAuth.Mvc.csproj">
       <Project>{2A9D9687-1822-41CF-B7DF-819BFC0F8FE9}</Project>
       <Name>OpenAuth.Mvc</Name>
diff --git a/OpenAuth.UnitTest/TestAuthen.cs b/OpenAuth.UnitTest/TestAuthen.cs
index 106adf62..67d94a0f 100644
--- a/OpenAuth.UnitTest/TestAuthen.cs
+++ b/OpenAuth.UnitTest/TestAuthen.cs
@@ -17,7 +17,7 @@ namespace OpenAuth.UnitTest
         [TestMethod]
         public void TestMethod1()
         {
-            AuthoriseFactory factory = new AuthoriseFactory(new UnitWork() );
+            AuthoriseFactory factory = new AuthoriseFactory( );
             var service=  factory.Create("System");
 
             var modules = service.Modules;
diff --git a/OpenAuth.UnitTest/TestUser.cs b/OpenAuth.UnitTest/TestUser.cs
index 47e4e285..7611ded6 100644
--- a/OpenAuth.UnitTest/TestUser.cs
+++ b/OpenAuth.UnitTest/TestUser.cs
@@ -54,7 +54,7 @@ namespace OpenAuth.UnitTest
             };
             var users = _app.Load(request);
 
-            Console.WriteLine(users.total);
+            Console.WriteLine(users.count);
         }
     }
 }
diff --git a/OpenAuth.WebApi/Areas/SSO/Controllers/LoginController.cs b/OpenAuth.WebApi/Areas/SSO/Controllers/LoginController.cs
index 978fc26e..28da832b 100644
--- a/OpenAuth.WebApi/Areas/SSO/Controllers/LoginController.cs
+++ b/OpenAuth.WebApi/Areas/SSO/Controllers/LoginController.cs
@@ -40,7 +40,7 @@ namespace OpenAuth.WebApi.Areas.SSO.Controllers
         {
             var result = SSOAuthUtil.Parse(model);
 
-            if (result.Success)
+            if (result.Code ==200)
             {
                 var redirectUrl = string.Format("{0}?token={1}&sessionusername={2}", result.ReturnUrl, result.Token, model.UserName);
 
diff --git a/OpenAuth.WebApi/OpenAuth.WebApi.csproj b/OpenAuth.WebApi/OpenAuth.WebApi.csproj
index 43617f70..8c031d7c 100644
--- a/OpenAuth.WebApi/OpenAuth.WebApi.csproj
+++ b/OpenAuth.WebApi/OpenAuth.WebApi.csproj
@@ -218,10 +218,6 @@
       <Project>{0bbf2d65-fffd-4272-b138-8ea4fb6fec48}</Project>
       <Name>OpenAuth.App</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OpenAuth.Domain\OpenAuth.Domain.csproj">
-      <Project>{6108da8e-92a1-4abe-b9f5-26d64d55ca2c}</Project>
-      <Name>OpenAuth.Domain</Name>
-    </ProjectReference>
     <ProjectReference Include="..\OpenAuth.Repository\OpenAuth.Repository.csproj">
       <Project>{e8df8dea-e2cf-4bdb-8f4f-3f8205b0e03a}</Project>
       <Name>OpenAuth.Repository</Name>
diff --git a/OpenAuth.WebApi/Web.config b/OpenAuth.WebApi/Web.config
index 499534d1..a256e112 100644
--- a/OpenAuth.WebApi/Web.config
+++ b/OpenAuth.WebApi/Web.config
@@ -38,18 +38,7 @@
     <!--登录超时时间-->
     <add key="AUTH_COOKIE_TIMEOUT_IN_MINUTES" value="5" />
   </appSettings>
-  <autofac defaultAssembly=" OpenAuth.Repository">
-    <components>
-      <component type=" OpenAuth.Repository.UserRepository" service=" OpenAuth.Domain.Interface.IUserRepository,OpenAuth.Domain" />
-      <component type=" OpenAuth.Repository.OrgRepository" service="OpenAuth.Domain.Interface.IOrgRepository,OpenAuth.Domain" />
-      <component type=" OpenAuth.Repository.RoleRepository" service="OpenAuth.Domain.Interface.IRoleRepository,OpenAuth.Domain" />
-      <component type=" OpenAuth.Repository.ModuleRepository" service="OpenAuth.Domain.Interface.IModuleRepository,OpenAuth.Domain" />
-      <component type=" OpenAuth.Repository.RelevanceRepository" service="OpenAuth.Domain.Interface.IRelevanceRepository,OpenAuth.Domain" />
-      <component type=" OpenAuth.Repository.CategoryRepository" service="OpenAuth.Domain.Interface.ICategoryRepository,OpenAuth.Domain" />
-      <component type=" OpenAuth.Repository.ResourceRepository" service="OpenAuth.Domain.Interface.IResourceRepository,OpenAuth.Domain" />
-      <component type=" OpenAuth.Repository.StockRepository" service="OpenAuth.Domain.Interface.IStockRepository,OpenAuth.Domain" />
-    </components>
-  </autofac>
+
   <system.web>
     <compilation debug="true" targetFramework="4.5" />
     <httpRuntime targetFramework="4.5" />
diff --git a/OpenAuth.WebTest/Controllers/LoginController.cs b/OpenAuth.WebTest/Controllers/LoginController.cs
index 7e0f2257..430a6271 100644
--- a/OpenAuth.WebTest/Controllers/LoginController.cs
+++ b/OpenAuth.WebTest/Controllers/LoginController.cs
@@ -18,7 +18,7 @@ namespace OpenAuth.WebTest.Controllers
         public ActionResult Index(string username, string password)
         {
             var result = AuthUtil.Login(_appKey, username, password);
-            if (result.Success)
+            if (result.Code == 200)
                 return Redirect("/home/index?Token=" + result.Token);
             else
             {
diff --git a/OpenAuth.sln b/OpenAuth.sln
index a8e05b23..3f26ec0c 100644
--- a/OpenAuth.sln
+++ b/OpenAuth.sln
@@ -1,23 +1,19 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1 Presentation(用户UI)", "1 Presentation(用户UI)", "{57649E80-38FC-421D-82E1-BE71A786F762}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "用户UI", "用户UI", "{57649E80-38FC-421D-82E1-BE71A786F762}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2 Application(应用层)", "2 Application(应用层)", "{757BB00A-46B6-4B9B-9331-D6B60BE92E05}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "应用层", "应用层", "{757BB00A-46B6-4B9B-9331-D6B60BE92E05}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3 Domain(领域层)", "3 Domain(领域层)", "{7618C0B1-D556-40C2-B2DD-CCECDC4E46B6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6 Test(测试)", "6 Test(测试)", "{C59DF46D-7815-462B-9FFF-750B2120B75B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test(测试)", "Test(测试)", "{C59DF46D-7815-462B-9FFF-750B2120B75B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenAuth.App", "OpenAuth.App\OpenAuth.App.csproj", "{0BBF2D65-FFFD-4272-B138-8EA4FB6FEC48}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenAuth.Domain", "OpenAuth.Domain\OpenAuth.Domain.csproj", "{6108DA8E-92A1-4ABE-B9F5-26D64D55CA2C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenAuth.UnitTest", "OpenAuth.UnitTest\OpenAuth.UnitTest.csproj", "{2E6B5B73-7757-43F0-8AC8-3030F7C191B8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4 功能适配层", "4 功能适配层", "{7A38939E-FC9B-44A9-BD3D-E0CE438624E6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "基础功能", "基础功能", "{7A38939E-FC9B-44A9-BD3D-E0CE438624E6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenAuth.Repository", "OpenAuth.Repository\OpenAuth.Repository.csproj", "{E8DF8DEA-E2CF-4BDB-8F4F-3F8205B0E03A}"
 EndProject
@@ -39,10 +35,6 @@ Global
 		{0BBF2D65-FFFD-4272-B138-8EA4FB6FEC48}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0BBF2D65-FFFD-4272-B138-8EA4FB6FEC48}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0BBF2D65-FFFD-4272-B138-8EA4FB6FEC48}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6108DA8E-92A1-4ABE-B9F5-26D64D55CA2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6108DA8E-92A1-4ABE-B9F5-26D64D55CA2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6108DA8E-92A1-4ABE-B9F5-26D64D55CA2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6108DA8E-92A1-4ABE-B9F5-26D64D55CA2C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E6B5B73-7757-43F0-8AC8-3030F7C191B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E6B5B73-7757-43F0-8AC8-3030F7C191B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E6B5B73-7757-43F0-8AC8-3030F7C191B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -73,7 +65,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{0BBF2D65-FFFD-4272-B138-8EA4FB6FEC48} = {757BB00A-46B6-4B9B-9331-D6B60BE92E05}
-		{6108DA8E-92A1-4ABE-B9F5-26D64D55CA2C} = {7618C0B1-D556-40C2-B2DD-CCECDC4E46B6}
 		{2E6B5B73-7757-43F0-8AC8-3030F7C191B8} = {C59DF46D-7815-462B-9FFF-750B2120B75B}
 		{E8DF8DEA-E2CF-4BDB-8F4F-3F8205B0E03A} = {7A38939E-FC9B-44A9-BD3D-E0CE438624E6}
 		{2A9D9687-1822-41CF-B7DF-819BFC0F8FE9} = {57649E80-38FC-421D-82E1-BE71A786F762}
diff --git a/数据库设计关系图/OpenAuthDB.pdm b/数据库设计关系图/OpenAuthDB.pdm
index d03c9958..d04f1a20 100644
--- a/数据库设计关系图/OpenAuthDB.pdm
+++ b/数据库设计关系图/OpenAuthDB.pdm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{54F96D9D-A534-4ADF-ADAD-ACFE3C42BC44}" Label="" LastModificationDate="1507615916" Name="OpenAuthDB" Objects="359" Symbols="25" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.6.1.5066"?>
+<?PowerDesigner AppLocale="UTF16" ID="{54F96D9D-A534-4ADF-ADAD-ACFE3C42BC44}" Label="" LastModificationDate="1507615916" Name="OpenAuthDB" Objects="344" Symbols="25" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.6.1.5066"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -3967,7 +3967,7 @@ PhysOpts=
 
 [ModelOptions\Default Opts\FRMESOB&lt;&lt;WorkloadGroup&gt;&gt;]
 PhysOpts=</a:ModelOptionsText>
-<a:RepositoryFilename>D:\Project\OpenAuth.Net\数据库设计关系图\OpenAuthDB.pdm</a:RepositoryFilename>
+<a:RepositoryFilename>F:\测试学习\OpenAuth.Net\数据库设计关系图\OpenAuthDB.pdm</a:RepositoryFilename>
 <c:GenerationOrigins>
 <o:Shortcut Id="o3">
 <a:ObjectID>9401CEBA-B163-4ADB-AECF-03CE78C0FFF3</a:ObjectID>
@@ -4609,8 +4609,8 @@ Shadow=0
 <o:ReferenceSymbol Id="o6">
 <a:CreationDate>1445621646</a:CreationDate>
 <a:ModificationDate>1486308596</a:ModificationDate>
-<a:Rect>((-16289,-28155), (-4109,-13841))</a:Rect>
-<a:ListOfPoints>((-11320,-28155),(-11320,-20119),(-9079,-20119),(-9079,-13841))</a:ListOfPoints>
+<a:Rect>((-15525,-28159), (-4651,-13633))</a:Rect>
+<a:ListOfPoints>((-11187,-28159),(-11187,-20119),(-8989,-20119),(-8989,-13633))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -4632,8 +4632,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <o:ReferenceSymbol Id="o10">
 <a:CreationDate>1507604605</a:CreationDate>
 <a:ModificationDate>1507605628</a:ModificationDate>
-<a:Rect>((37892,-46260), (50904,-35818))</a:Rect>
-<a:ListOfPoints>((37892,-46260),(50904,-35818))</a:ListOfPoints>
+<a:Rect>((38717,-46225), (50312,-35679))</a:Rect>
+<a:ListOfPoints>((38717,-46225),(50312,-35679))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>12615680</a:LineColor>
@@ -4677,7 +4677,7 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1445619891</a:CreationDate>
 <a:ModificationDate>1504801532</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-20822,-18333), (4556,-4087))</a:Rect>
+<a:Rect>((-19617,-17771), (3351,-4649))</a:Rect>
 <a:ShadowStyle>3</a:ShadowStyle>
 <a:LineColor>12615680</a:LineColor>
 <a:LineWidth>1</a:LineWidth>
@@ -4702,7 +4702,7 @@ Triggers 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1445621167</a:CreationDate>
 <a:ModificationDate>1504801532</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-20854,-34427), (1064,-21981))</a:Rect>
+<a:Rect>((-19834,-33940), (44,-22468))</a:Rect>
 <a:ShadowStyle>3</a:ShadowStyle>
 <a:LineColor>12615680</a:LineColor>
 <a:LineWidth>1</a:LineWidth>
@@ -4754,7 +4754,7 @@ Triggers 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1445623111</a:CreationDate>
 <a:ModificationDate>1505973354</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((35997,-28184), (61807,-11238))</a:Rect>
+<a:Rect>((37225,-27510), (60579,-11912))</a:Rect>
 <a:ShadowStyle>3</a:ShadowStyle>
 <a:LineColor>12615680</a:LineColor>
 <a:LineWidth>1</a:LineWidth>
@@ -4779,7 +4779,7 @@ Triggers 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1445623375</a:CreationDate>
 <a:ModificationDate>1504801532</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((33792,-9961), (54844,-2015))</a:Rect>
+<a:Rect>((34765,-9662), (53871,-2314))</a:Rect>
 <a:ShadowStyle>3</a:ShadowStyle>
 <a:LineColor>12615680</a:LineColor>
 <a:LineWidth>1</a:LineWidth>
@@ -4804,7 +4804,7 @@ Triggers 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1445623879</a:CreationDate>
 <a:ModificationDate>1505973346</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((7453,-25554), (31967,-15808))</a:Rect>
+<a:Rect>((8612,-25180), (30808,-16182))</a:Rect>
 <a:ShadowStyle>3</a:ShadowStyle>
 <a:LineColor>12615680</a:LineColor>
 <a:LineWidth>1</a:LineWidth>
@@ -4856,7 +4856,7 @@ Triggers 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1450016158</a:CreationDate>
 <a:ModificationDate>1507605628</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((35555,-50674), (57905,-40926))</a:Rect>
+<a:Rect>((36598,-50299), (56862,-41301))</a:Rect>
 <a:ShadowStyle>3</a:ShadowStyle>
 <a:LineColor>12615680</a:LineColor>
 <a:LineWidth>1</a:LineWidth>
@@ -4881,7 +4881,7 @@ Triggers 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1507604399</a:CreationDate>
 <a:ModificationDate>1507605628</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((33979,-37468), (55031,-30422))</a:Rect>
+<a:Rect>((34952,-37206), (54058,-30684))</a:Rect>
 <a:ShadowStyle>3</a:ShadowStyle>
 <a:LineColor>12615680</a:LineColor>
 <a:LineWidth>1</a:LineWidth>