check issue #3

2025-04-05 17:38:01 +08:00 · 2016-01-05 10:03:35 +08:00 · 2016-01-05 10:03:35 +08:00 · 942f606a2b
commit 942f606a2b
parent 7cc293c121
99 changed files with 135 additions and 99 deletions
--- a/CodeSmith/Add.cshtml.cst
+++ b/CodeSmith/Add.cshtml.cst
@ -1,4 +1,4 @@
-<%-- 
+<%-- 
 Name: 添加界面
 Author: yubaolee
 Description: 任务对象界面
--- a/CodeSmith/Application.cst
+++ b/CodeSmith/Application.cst
@ -1,4 +1,4 @@
-<%-- 
+<%-- 
 Name: Database Table Properties
 Author: yubaolee
 Description: Create a list of properties from a database table
--- a/CodeSmith/Controller.cst
+++ b/CodeSmith/Controller.cst
@ -1,4 +1,4 @@
-<%-- 
+<%-- 
 Name: Database Table Properties
 Author: yubaolee
 Description: Create a list of properties from a database table
--- a/CodeSmith/IRepository.cst
+++ b/CodeSmith/IRepository.cst
@ -1,4 +1,4 @@
-<%-- 
+<%-- 
 Name: Database Table Properties
 Author: yubaolee
 Description: Create a list of properties from a database table
--- a/CodeSmith/Index.cshtml.cst
+++ b/CodeSmith/Index.cshtml.cst
@ -1,4 +1,4 @@
-<%-- 
+<%-- 
 Name: Database Table Properties
 Author: yubaolee
 Description: Create a list of properties from a database table
--- a/CodeSmith/NoCascadeIndex.cshtml.cst
+++ b/CodeSmith/NoCascadeIndex.cshtml.cst
@ -1,4 +1,4 @@
-<%-- 
+<%-- 
 Name: Database Table Properties
 Author: yubaolee
 Description: 没有树状导航的datagrid
--- a/CodeSmith/Repository.cst
+++ b/CodeSmith/Repository.cst
@ -1,4 +1,4 @@
-<%-- 
+<%-- 
 Name: 数据访问
 Author: yubaolee
 Description: 
--- a/Infrastructure/AutoMapperExt.cs
+++ b/Infrastructure/AutoMapperExt.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : FairUtility
 // Author           : Yubao Li
 // Created          : 08-27-2015
--- a/Infrastructure/ControlHelper.cs
+++ b/Infrastructure/ControlHelper.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;

 namespace Infrastructure
--- a/Infrastructure/CookieHelper.cs
+++ b/Infrastructure/CookieHelper.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : Infrastructure
 // Author           : Administrator
 // Created          : 09-22-2015
--- a/Infrastructure/DynamicLinq.cs
+++ b/Infrastructure/DynamicLinq.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : FairUtility
 // Author           : Yubao Li
 // Created          : 08-18-2015
--- a/Infrastructure/DynamicQueryable.cs
+++ b/Infrastructure/DynamicQueryable.cs
@ -1,4 +1,4 @@
-//Copyright (C) Microsoft Corporation.  All rights reserved.
+//Copyright (C) Microsoft Corporation.  All rights reserved.

 using System;
 using System.Collections.Generic;
--- a/Infrastructure/Filter.cs
+++ b/Infrastructure/Filter.cs
@ -1,4 +1,4 @@
-namespace Infrastructure
+namespace Infrastructure
 {
    public class Filter
    {
--- a/Infrastructure/GenerateId.cs
+++ b/Infrastructure/GenerateId.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : FairUtility
 // Author           : Yubao Li
 // Created          : 10-13-2015
--- a/Infrastructure/Infrastructure.csproj
+++ b/Infrastructure/Infrastructure.csproj
@ -11,6 +11,8 @@
    <AssemblyName>Infrastructure</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@ -70,6 +72,13 @@
    <None Include="packages.config" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/Infrastructure/JsonConverter.cs
+++ b/Infrastructure/JsonConverter.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : Infrastructure
 // Author           : Yubao Li
 // Created          : 09-07-2015
--- a/Infrastructure/JsonHelper.cs
+++ b/Infrastructure/JsonHelper.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : FairUtility
 // Author           : Yubao Li
 // Created          : 08-12-2015
--- a/Infrastructure/LogHelper.cs
+++ b/Infrastructure/LogHelper.cs
@ -1,4 +1,4 @@
-using log4net;
+using log4net;

 [assembly: log4net.Config.XmlConfigurator(Watch = true)]   
 namespace Infrastructure
--- a/Infrastructure/ObjectHelper.cs
+++ b/Infrastructure/ObjectHelper.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : Infrastructure
 // Author           : Yubao Li
 // Created          : 11-23-2015
--- a/Infrastructure/PredicateBuilder.cs
+++ b/Infrastructure/PredicateBuilder.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Linq.Expressions;

--- a/Infrastructure/Properties/AssemblyInfo.cs
+++ b/Infrastructure/Properties/AssemblyInfo.cs
@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

--- a/Infrastructure/Response.cs
+++ b/Infrastructure/Response.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
--- a/Infrastructure/SessionHelper.cs
+++ b/Infrastructure/SessionHelper.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : Infrastructure
 // Author           : Administrator
 // Created          : 09-22-2015
--- a/OpenAuth.App/LoginApp.cs
+++ b/OpenAuth.App/LoginApp.cs
@ -1,4 +1,4 @@
-using OpenAuth.Domain.Interface;
+using OpenAuth.Domain.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
--- a/OpenAuth.App/ModuleElementManagerApp.cs
+++ b/OpenAuth.App/ModuleElementManagerApp.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : OpenAuth.App
 // Author           : Yubao Li
 // Created          : 12-02-2015
--- a/OpenAuth.App/OrgManagerApp.cs
+++ b/OpenAuth.App/OrgManagerApp.cs
@ -1,4 +1,4 @@
-using OpenAuth.Domain;
+using OpenAuth.Domain;
 using OpenAuth.Domain.Interface;
 using System;
 using System.Collections.Generic;
--- a/OpenAuth.App/Properties/AssemblyInfo.cs
+++ b/OpenAuth.App/Properties/AssemblyInfo.cs
@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;

 // 有关程序集的常规信息通过以下
--- a/OpenAuth.App/UserManagerApp.cs
+++ b/OpenAuth.App/UserManagerApp.cs
@ -1,4 +1,4 @@
-using OpenAuth.App.ViewModel;
+using OpenAuth.App.ViewModel;
 using OpenAuth.Domain;
 using OpenAuth.Domain.Interface;
 using System;
--- a/OpenAuth.App/ViewModel/LoginUserVM.cs
+++ b/OpenAuth.App/ViewModel/LoginUserVM.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : OpenAuth.App
 // Author           : Yubao Li
 // Created          : 12-01-2015
--- a/OpenAuth.App/ViewModel/ModuleView.cs
+++ b/OpenAuth.App/ViewModel/ModuleView.cs
@ -1,4 +1,4 @@
-using Infrastructure;
+using Infrastructure;
 using OpenAuth.Domain;
 using System.Collections.Generic;

--- a/OpenAuth.App/ViewModel/ResourceVM.cs
+++ b/OpenAuth.App/ViewModel/ResourceVM.cs
@ -1,4 +1,4 @@
-namespace OpenAuth.App.ViewModel
+namespace OpenAuth.App.ViewModel
 {
    public  class ResourceVM
    {
--- a/OpenAuth.App/ViewModel/RoleVM.cs
+++ b/OpenAuth.App/ViewModel/RoleVM.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : OpenAuth.App
 // Author           : yubaolee
 // Created          : 11-29-2015
--- a/OpenAuth.App/ViewModel/UserView.cs
+++ b/OpenAuth.App/ViewModel/UserView.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Infrastructure;
 using OpenAuth.Domain;
--- a/OpenAuth.Domain/Interface/IOrgRepository.cs
+++ b/OpenAuth.Domain/Interface/IOrgRepository.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
--- a/OpenAuth.Domain/Interface/IRelevanceRepository.cs
+++ b/OpenAuth.Domain/Interface/IRelevanceRepository.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : OpenAuth.Domain
 // Author           : Yubao Li
 // Created          : 11-30-2015
--- a/OpenAuth.Domain/Interface/IRepository.cs
+++ b/OpenAuth.Domain/Interface/IRepository.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : OpenAuth.Domain
 // Author           : yubaolee
 // Created          : 10-25-2015
--- a/OpenAuth.Domain/Properties/AssemblyInfo.cs
+++ b/OpenAuth.Domain/Properties/AssemblyInfo.cs
@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;

 // 有关程序集的常规信息通过以下
--- a/OpenAuth.Mvc/App_Start/BundleConfig.cs
+++ b/OpenAuth.Mvc/App_Start/BundleConfig.cs
@ -1,4 +1,4 @@
-using System.Web;
+using System.Web;
 using System.Web.Optimization;

 namespace OpenAuth.Mvc
--- a/OpenAuth.Mvc/App_Start/FilterConfig.cs
+++ b/OpenAuth.Mvc/App_Start/FilterConfig.cs
@ -1,4 +1,4 @@
-using System.Web;
+using System.Web;
 using System.Web.Mvc;

 namespace OpenAuth.Mvc
--- a/OpenAuth.Mvc/App_Start/RouteConfig.cs
+++ b/OpenAuth.Mvc/App_Start/RouteConfig.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
--- a/OpenAuth.Mvc/AutofacExt.cs
+++ b/OpenAuth.Mvc/AutofacExt.cs
@ -9,7 +9,7 @@
 // <copyright file="AutofacExt.cs" company="www.cnblogs.com/yubaolee">
 //     Copyright (c) www.cnblogs.com/yubaolee. All rights reserved.
 // </copyright>
-// <summary>IOC初始化</summary>
+// <summary>IOC扩展</summary>
 // ***********************************************************************

 using Autofac;
@ -29,10 +29,10 @@ namespace OpenAuth.Mvc
        {
            var builder = new ContainerBuilder();

-            //泛型注册
+            //<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ע<EFBFBD><EFBFBD>
            builder.RegisterGeneric(typeof(BaseRepository<>)).As(typeof(IRepository<>));

-            //应用层注册
+            //Ӧ<EFBFBD>ò<EFBFBD>ע<EFBFBD><EFBFBD>
            builder.RegisterModule(new ConfigurationSettingsReader("autofac"));
            builder.RegisterType<LoginApp>();
            builder.RegisterType<OrgManagerApp>();
@ -65,7 +65,7 @@ namespace OpenAuth.Mvc
        }

        /// <summary>
-        /// 从依赖容器里面获取
+        /// <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ
        /// </summary>
        /// <typeparam name="T"></typeparam>
        public static T GetFromFac<T>()
--- a/OpenAuth.Mvc/Controllers/BaseController.cs
+++ b/OpenAuth.Mvc/Controllers/BaseController.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : OpenAuth.Mvc
 // Author           : Administrator
 // Created          : 09-22-2015
--- a/OpenAuth.Mvc/Controllers/ErrorController.cs
+++ b/OpenAuth.Mvc/Controllers/ErrorController.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
--- a/OpenAuth.Mvc/Controllers/HomeController.cs
+++ b/OpenAuth.Mvc/Controllers/HomeController.cs
@ -1,4 +1,4 @@
-using System.Web.Mvc;
+using System.Web.Mvc;
 using Infrastructure;
 using Infrastructure.Helper;
 using OpenAuth.App;
--- a/OpenAuth.Mvc/Controllers/LoginController.cs
+++ b/OpenAuth.Mvc/Controllers/LoginController.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
--- a/OpenAuth.Mvc/Controllers/ModuleElementManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/ModuleElementManagerController.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : OpenAuth.Mvc
 // Author           : Yubao Li
 // Created          : 12-02-2015
--- a/OpenAuth.Mvc/Controllers/OrgManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/OrgManagerController.cs
@ -1,4 +1,4 @@
-using Infrastructure;
+using Infrastructure;
 using OpenAuth.App;
 using OpenAuth.Domain;
 using OpenAuth.Mvc.Models;
--- a/OpenAuth.Mvc/Controllers/UserManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/UserManagerController.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Web.Mvc;
 using Infrastructure;
--- a/OpenAuth.Mvc/Global.asax.cs
+++ b/OpenAuth.Mvc/Global.asax.cs
@ -1,4 +1,4 @@
-using System.Web;
+using System.Web;
 using System.Web.Mvc;
 using System.Web.Optimization;
 using System.Web.Routing;
--- a/OpenAuth.Mvc/Models/BJUIResponse.cs
+++ b/OpenAuth.Mvc/Models/BJUIResponse.cs
@ -1,4 +1,4 @@
-// ***********************************************************************
+// ***********************************************************************
 // Assembly         : OpenAuth.Mvc
 // Author           : yubaolee
 // Created          : 11-05-2015
--- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj
+++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
@ -21,6 +21,8 @@
    <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@ -672,6 +674,13 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/OpenAuth.Mvc/Properties/AssemblyInfo.cs
+++ b/OpenAuth.Mvc/Properties/AssemblyInfo.cs
@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

--- a/OpenAuth.Mvc/Views/CategoryManager/Add.cshtml
+++ b/OpenAuth.Mvc/Views/CategoryManager/Add.cshtml
@ -1,4 +1,4 @@
-@model OpenAuth.Domain.Category
+@model OpenAuth.Domain.Category
@{
    ViewBag.Title = "Category编辑界面";
    Layout = null;
--- a/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml
@ -1,4 +1,4 @@
-@{
+@{
    string _prefix = "Category";
    var _treeId = _prefix + "Tree";
    var _gridId = _prefix + "Grid";
--- a/OpenAuth.Mvc/Views/Error/NoAccess.cshtml
+++ b/OpenAuth.Mvc/Views/Error/NoAccess.cshtml
@ -1,4 +1,4 @@
-@{
+@{
    Layout = null;
 }

--- a/OpenAuth.Mvc/Views/Home/Index.cshtml
+++ b/OpenAuth.Mvc/Views/Home/Index.cshtml
@ -1,4 +1,4 @@
-@model List<OpenAuth.App.ViewModel.ModuleView>
+@model List<OpenAuth.App.ViewModel.ModuleView>
 <!DOCTYPE html>
 <html lang="zh">
 <head>
--- a/OpenAuth.Mvc/Views/Home/Main.cshtml
+++ b/OpenAuth.Mvc/Views/Home/Main.cshtml
@ -1,4 +1,4 @@
-
+
@{
    Layout = null;
 }
--- a/OpenAuth.Mvc/Views/Home/MenuHeader.cshtml
+++ b/OpenAuth.Mvc/Views/Home/MenuHeader.cshtml
@ -1,4 +1,4 @@
-@using System.Text
+@using System.Text
 <div class="bjui-pageHeader">
    <div class="bjui-searchBar">
        <div class="bjui-searchBar">
--- a/OpenAuth.Mvc/Views/Login/Index.cshtml
+++ b/OpenAuth.Mvc/Views/Login/Index.cshtml
@ -1,4 +1,4 @@
-@model OpenAuth.Mvc.Models.BjuiResponse
+@model OpenAuth.Mvc.Models.BjuiResponse
 <!DOCTYPE html>
 <html lang="zh">
 <head>
--- a/OpenAuth.Mvc/Views/ModuleElementManager/AssignForRole.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleElementManager/AssignForRole.cshtml
@ -1,4 +1,4 @@
-@{
+@{
    string _prefix = "assignForRole";
    var _treeId = _prefix + "Tree";
    var _gridId = _prefix + "Grid";
--- a/OpenAuth.Mvc/Views/ModuleElementManager/AssignForUser.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleElementManager/AssignForUser.cshtml
@ -1,4 +1,4 @@
-@{
+@{
    string _prefix = "assignForUser";
    var _treeId = _prefix + "Tree";
    var _gridId = _prefix + "Grid";
--- a/OpenAuth.Mvc/Views/ModuleElementManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleElementManager/Index.cshtml
@ -1,4 +1,4 @@
-@model IEnumerable<OpenAuth.Domain.ModuleElement>
+@model IEnumerable<OpenAuth.Domain.ModuleElement>

 <script type="text/javascript">

--- a/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml
@ -1,4 +1,4 @@
-@model OpenAuth.Domain.Module
+@model OpenAuth.Domain.Module
@{
    ViewBag.Title = "Module编辑界面";
    Layout = null;
--- a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
@ -1,4 +1,4 @@
-@{
+@{
    string _prefix = "Module";
    var _treeId = _prefix + "Tree";
    var _gridId = _prefix + "Grid";
--- a/OpenAuth.Mvc/Views/ModuleManager/LookupMultiForRole.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleManager/LookupMultiForRole.cshtml
@ -1,4 +1,4 @@
-@*
+@*
    选择多个模块ID，以ids的形式返回
 *@

--- a/OpenAuth.Mvc/Views/ModuleManager/LookupMultiForUser.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleManager/LookupMultiForUser.cshtml
@ -1,4 +1,4 @@
-@*
+@*
    选择多个模块ID，以ids的形式返回
 *@

--- a/OpenAuth.Mvc/Views/OrgManager/AddOrg.cshtml
+++ b/OpenAuth.Mvc/Views/OrgManager/AddOrg.cshtml
@ -1,4 +1,4 @@
-@{
+@{
    ViewBag.Title = "title";
    Layout = null;
 }
--- a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml
@ -1,4 +1,4 @@
-@{
+@{
    string _prefix = "org";
    var _treeId = _prefix + "Tree";
    var _gridId = _prefix + "Grid";
--- a/OpenAuth.Mvc/Views/OrgManager/LookupParent.cshtml
+++ b/OpenAuth.Mvc/Views/OrgManager/LookupParent.cshtml
@ -1,4 +1,4 @@
-@model dynamic
+@model dynamic

@{
    ViewBag.Title = "title";
--- a/OpenAuth.Mvc/Views/ResourceManager/Add.cshtml
+++ b/OpenAuth.Mvc/Views/ResourceManager/Add.cshtml
@ -1,4 +1,4 @@
-@model OpenAuth.Domain.Resource
+@model OpenAuth.Domain.Resource
@{
    ViewBag.Title = "Resource编辑界面";
    Layout = null;
--- a/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml
@ -1,4 +1,4 @@
-@{
+@{
    string _prefix = "Resource";
    var _treeId = _prefix + "Tree";
    var _gridId = _prefix + "Grid";
@ -156,7 +156,7 @@
            url: '/ResourceManager/Add?id=' + selected,
            title: '编辑',
            onClose:function() {
-                refreshModuleGrid();
+                refreshResourceGrid();
            }
        });

--- a/OpenAuth.Mvc/Views/ResourceManager/LookupMultiForRole.cshtml
+++ b/OpenAuth.Mvc/Views/ResourceManager/LookupMultiForRole.cshtml
@ -1,4 +1,4 @@
-@{
+@{
    string _prefix = "assignResForRole";
    var _treeId = _prefix + "Tree";
    var _gridId = _prefix + "Grid";
--- a/OpenAuth.Mvc/Views/ResourceManager/LookupMultiForUser.cshtml
+++ b/OpenAuth.Mvc/Views/ResourceManager/LookupMultiForUser.cshtml
@ -1,4 +1,4 @@
-@{
+@{
    string _prefix = "assignResForUser";
    var _treeId = _prefix + "Tree";
    var _gridId = _prefix + "Grid";
--- a/OpenAuth.Mvc/Views/RoleManager/Add.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/Add.cshtml
@ -1,4 +1,4 @@
-@model OpenAuth.Domain.Role
+@model OpenAuth.Domain.Role
@{
    ViewBag.Title = "title";
    Layout = null;
--- a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
@ -1,4 +1,4 @@
-@{
+@{
    string _prefix = "Role";
    var _treeId = _prefix + "Tree";
    var _gridId = _prefix + "Grid";
--- a/OpenAuth.Mvc/Views/RoleManager/LookupMulti.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/LookupMulti.cshtml
@ -1,4 +1,4 @@
-@{
+@{
    string _prefix = "assignRoleForUser";
    var _treeId = _prefix + "Tree";
    var _gridId = _prefix + "Grid";
--- a/OpenAuth.Mvc/Views/Shared/_Layout.cshtml
+++ b/OpenAuth.Mvc/Views/Shared/_Layout.cshtml
@ -1 +1 @@
-@RenderBody()
+@RenderBody()
--- a/OpenAuth.Mvc/Views/UserManager/Add.cshtml
+++ b/OpenAuth.Mvc/Views/UserManager/Add.cshtml
@ -1,4 +1,4 @@
-@model OpenAuth.App.ViewModel.UserView
+@model OpenAuth.App.ViewModel.UserView
@{
    ViewBag.Title = "title";
    Layout = null;
--- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml
@ -1,4 +1,4 @@
-@{
+@{
    string _prefix = "user";
    var _treeId = _prefix + "Tree";
    var _gridId = _prefix + "Grid";
--- a/OpenAuth.Mvc/Views/_ViewStart.cshtml
+++ b/OpenAuth.Mvc/Views/_ViewStart.cshtml
@ -1,3 +1,3 @@
-@{
+@{
    Layout = "~/Views/Shared/_Layout.cshtml";
 }
--- a/OpenAuth.Repository/BaseRepository.cs
+++ b/OpenAuth.Repository/BaseRepository.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data.Entity;
 using System.Data.Entity.Migrations;
 using System.Linq;
--- a/OpenAuth.Repository/CategoryRepository.cs
+++ b/OpenAuth.Repository/CategoryRepository.cs
@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using OpenAuth.Domain;
 using OpenAuth.Domain.Interface;
--- a/OpenAuth.Repository/ModuleRepository.cs
+++ b/OpenAuth.Repository/ModuleRepository.cs
@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using OpenAuth.Domain;
 using OpenAuth.Domain.Interface;
--- a/OpenAuth.Repository/OpenAuth.Repository.csproj
+++ b/OpenAuth.Repository/OpenAuth.Repository.csproj
@ -12,6 +12,8 @@
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@ -100,6 +102,13 @@
    <Content Include="CodeTemplates\ReverseEngineerCodeFirst\Mapping.tt" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/OpenAuth.Repository/OrgRepository.cs
+++ b/OpenAuth.Repository/OrgRepository.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
--- a/OpenAuth.Repository/Properties/AssemblyInfo.cs
+++ b/OpenAuth.Repository/Properties/AssemblyInfo.cs
@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;

 // 有关程序集的常规信息通过以下
--- a/OpenAuth.Repository/RelevanceRepository.cs
+++ b/OpenAuth.Repository/RelevanceRepository.cs
@ -1,4 +1,4 @@
-using OpenAuth.Domain;
+using OpenAuth.Domain;
 using OpenAuth.Domain.Interface;
 using System;
 using System.Linq;
--- a/OpenAuth.Repository/ResourceRepository.cs
+++ b/OpenAuth.Repository/ResourceRepository.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
--- a/OpenAuth.Repository/RoleRepository.cs
+++ b/OpenAuth.Repository/RoleRepository.cs
@ -1,4 +1,4 @@
-using OpenAuth.Domain;
+using OpenAuth.Domain;
 using OpenAuth.Domain.Interface;
 using System.Collections.Generic;
 using System.Linq;
--- a/OpenAuth.Repository/UserRepository.cs
+++ b/OpenAuth.Repository/UserRepository.cs
@ -1,4 +1,4 @@
-using OpenAuth.Domain.Interface;
+using OpenAuth.Domain.Interface;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
--- a/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj
+++ b/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj
@ -17,6 +17,8 @@
    <IsCodedUITest>False</IsCodedUITest>
    <TestProjectType>UnitTest</TestProjectType>
    <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@ -115,6 +117,13 @@
  </Choose>
  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/OpenAuth.UnitTest/Properties/AssemblyInfo.cs
+++ b/OpenAuth.UnitTest/Properties/AssemblyInfo.cs
@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;

 // 有关程序集的常规信息通过以下特性集 
--- a/OpenAuth.UnitTest/TestFunction.cs
+++ b/OpenAuth.UnitTest/TestFunction.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Collections.Generic;
 using Infrastructure;
--- a/OpenAuth.UnitTest/TestLogin.cs
+++ b/OpenAuth.UnitTest/TestLogin.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
--- a/OpenAuth.UnitTest/TestModuleApp.cs
+++ b/OpenAuth.UnitTest/TestModuleApp.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
--- a/OpenAuth.UnitTest/TestOrgApp.cs
+++ b/OpenAuth.UnitTest/TestOrgApp.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
--- a/OpenAuth.UnitTest/TestRepository.cs
+++ b/OpenAuth.UnitTest/TestRepository.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
--- a/OpenAuth.UnitTest/TestRoleApp.cs
+++ b/OpenAuth.UnitTest/TestRoleApp.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
--- a/OpenAuth.UnitTest/TestUserApp.cs
+++ b/OpenAuth.UnitTest/TestUserApp.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;