diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..bcc77352 --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/OpenAuth.Mvc/bin +/OpenAuth.Repository/bin/Debug +/OpenAuth.Repository/obj/Debug +/OpenAuth.UnitTest/bin/Debug +/OpenAuth.UnitTest/obj/Debug +/OpenAuth.WebApi/bin +/OpenAuth.WebTest/bin +/OpenAuth.WebTest/obj/Debug +/packages +/OpenAuth.WebApi/obj/Debug +/OpenAuth.Mvc/log +/OpenAuth.Mvc/obj/Debug +*.user +/OpenAuth.Domain/obj/Debug +/OpenAuth.App/obj/Debug +/OpenAuth.Domain/bin/Debug +/OpenAuth.App/bin +/Infrastructure/bin/Debug +/Infrastructure/obj/Debug +/.vs +/OpenAuth.sln.GhostDoc.xml +/类结构.mdj +/数据库设计关系图/OpenAuthDB.pdb diff --git a/Infrastructure/Infrastructure.csproj b/Infrastructure/Infrastructure.csproj index c82cc7da..79bcd758 100644 --- a/Infrastructure/Infrastructure.csproj +++ b/Infrastructure/Infrastructure.csproj @@ -85,6 +85,7 @@ + @@ -92,6 +93,7 @@ + @@ -109,18 +111,18 @@ - - \ No newline at end of file diff --git a/OpenAuth.Domain/ApplyTransitionHistory.cs b/OpenAuth.Domain/Core/ApplyTransitionHistory.cs similarity index 100% rename from OpenAuth.Domain/ApplyTransitionHistory.cs rename to OpenAuth.Domain/Core/ApplyTransitionHistory.cs diff --git a/OpenAuth.Domain/Category.cs b/OpenAuth.Domain/Core/Category.cs similarity index 96% rename from OpenAuth.Domain/Category.cs rename to OpenAuth.Domain/Core/Category.cs index a0d340c9..83445d2e 100644 --- a/OpenAuth.Domain/Category.cs +++ b/OpenAuth.Domain/Core/Category.cs @@ -1,60 +1,60 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a CodeSmith Template. -// -// DO NOT MODIFY contents of this file. Changes to this -// file will be lost if the code is regenerated. -// Author:Yubao Li -// -//------------------------------------------------------------------------------ - -using System; - -namespace OpenAuth.Domain -{ - /// - /// 分类表 - /// - public partial class Category :Entity - { - public Category() - { - this.CascadeId= string.Empty; - this.Name= string.Empty; - this.Status= 0; - this.SortNo= 0; - this.RootKey= string.Empty; - this.RootName= string.Empty; - } - - /// - /// 节点语义ID - /// - public string CascadeId { get; set; } - /// - /// 名称 - /// - public string Name { get; set; } - /// - /// 当前状态 - /// - public int Status { get; set; } - /// - /// 排序号 - /// - public int SortNo { get; set; } - /// - /// 分类所属科目 - /// - public string RootKey { get; set; } - /// - /// 分类所属科目名称 - /// - public string RootName { get; set; } - /// - /// 父节点流水号 - /// - public System.Guid? ParentId { get; set; } - - } +//------------------------------------------------------------------------------ +// +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +// +//------------------------------------------------------------------------------ + +using System; + +namespace OpenAuth.Domain +{ + /// + /// 分类表 + /// + public partial class Category :Entity + { + public Category() + { + this.CascadeId= string.Empty; + this.Name= string.Empty; + this.Status= 0; + this.SortNo= 0; + this.RootKey= string.Empty; + this.RootName= string.Empty; + } + + /// + /// 节点语义ID + /// + public string CascadeId { get; set; } + /// + /// 名称 + /// + public string Name { get; set; } + /// + /// 当前状态 + /// + public int Status { get; set; } + /// + /// 排序号 + /// + public int SortNo { get; set; } + /// + /// 分类所属科目 + /// + public string RootKey { get; set; } + /// + /// 分类所属科目名称 + /// + public string RootName { get; set; } + /// + /// 父节点流水号 + /// + public System.Guid? ParentId { get; set; } + + } } \ No newline at end of file diff --git a/OpenAuth.Domain/CommonApply.cs b/OpenAuth.Domain/Core/CommonApply.cs similarity index 100% rename from OpenAuth.Domain/CommonApply.cs rename to OpenAuth.Domain/Core/CommonApply.cs diff --git a/OpenAuth.Domain/DicDetail.cs b/OpenAuth.Domain/Core/DicDetail.cs similarity index 96% rename from OpenAuth.Domain/DicDetail.cs rename to OpenAuth.Domain/Core/DicDetail.cs index ba0a4873..54baa908 100644 --- a/OpenAuth.Domain/DicDetail.cs +++ b/OpenAuth.Domain/Core/DicDetail.cs @@ -1,55 +1,55 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a CodeSmith Template. -// -// DO NOT MODIFY contents of this file. Changes to this -// file will be lost if the code is regenerated. -// Author:Yubao Li -// -//------------------------------------------------------------------------------ - -using System; - -namespace OpenAuth.Domain -{ - /// - /// 数据字典详情 - /// - public partial class DicDetail :Entity - { - public DicDetail() - { - this.Value= string.Empty; - this.Text= string.Empty; - this.SortNo= 0; - this.Status= 0; - this.Description= string.Empty; - } - - /// - /// 值 - /// - public string Value { get; set; } - /// - /// 文本描述 - /// - public string Text { get; set; } - /// - /// 排序号 - /// - public int SortNo { get; set; } - /// - /// 状态 - /// - public int Status { get; set; } - /// - /// 描述 - /// - public string Description { get; set; } - /// - /// 所属字典ID - /// - public System.Guid DicId { get; set; } - - } +//------------------------------------------------------------------------------ +// +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +// +//------------------------------------------------------------------------------ + +using System; + +namespace OpenAuth.Domain +{ + /// + /// 数据字典详情 + /// + public partial class DicDetail :Entity + { + public DicDetail() + { + this.Value= string.Empty; + this.Text= string.Empty; + this.SortNo= 0; + this.Status= 0; + this.Description= string.Empty; + } + + /// + /// 值 + /// + public string Value { get; set; } + /// + /// 文本描述 + /// + public string Text { get; set; } + /// + /// 排序号 + /// + public int SortNo { get; set; } + /// + /// 状态 + /// + public int Status { get; set; } + /// + /// 描述 + /// + public string Description { get; set; } + /// + /// 所属字典ID + /// + public System.Guid DicId { get; set; } + + } } \ No newline at end of file diff --git a/OpenAuth.Domain/DicIndex.cs b/OpenAuth.Domain/Core/DicIndex.cs similarity index 96% rename from OpenAuth.Domain/DicIndex.cs rename to OpenAuth.Domain/Core/DicIndex.cs index 90da8b75..6c401028 100644 --- a/OpenAuth.Domain/DicIndex.cs +++ b/OpenAuth.Domain/Core/DicIndex.cs @@ -1,50 +1,50 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a CodeSmith Template. -// -// DO NOT MODIFY contents of this file. Changes to this -// file will be lost if the code is regenerated. -// Author:Yubao Li -// -//------------------------------------------------------------------------------ - -using System; - -namespace OpenAuth.Domain -{ - /// - /// 数据字典 - /// - public partial class DicIndex :Entity - { - public DicIndex() - { - this.Name= string.Empty; - this.Key= string.Empty; - this.SortNo= 0; - this.Description= string.Empty; - } - - /// - /// 名称 - /// - public string Name { get; set; } - /// - /// - /// - public string Key { get; set; } - /// - /// 排序号 - /// - public int SortNo { get; set; } - /// - /// 描述 - /// - public string Description { get; set; } - /// - /// 所属分类 - /// - public System.Guid? CategoryId { get; set; } - - } +//------------------------------------------------------------------------------ +// +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +// +//------------------------------------------------------------------------------ + +using System; + +namespace OpenAuth.Domain +{ + /// + /// 数据字典 + /// + public partial class DicIndex :Entity + { + public DicIndex() + { + this.Name= string.Empty; + this.Key= string.Empty; + this.SortNo= 0; + this.Description= string.Empty; + } + + /// + /// 名称 + /// + public string Name { get; set; } + /// + /// + /// + public string Key { get; set; } + /// + /// 排序号 + /// + public int SortNo { get; set; } + /// + /// 描述 + /// + public string Description { get; set; } + /// + /// 所属分类 + /// + public System.Guid? CategoryId { get; set; } + + } } \ No newline at end of file diff --git a/OpenAuth.Domain/Entity.cs b/OpenAuth.Domain/Core/Entity.cs similarity index 100% rename from OpenAuth.Domain/Entity.cs rename to OpenAuth.Domain/Core/Entity.cs diff --git a/OpenAuth.Domain/Module.cs b/OpenAuth.Domain/Core/Module.cs similarity index 96% rename from OpenAuth.Domain/Module.cs rename to OpenAuth.Domain/Core/Module.cs index 77734ce9..e9488e10 100644 --- a/OpenAuth.Domain/Module.cs +++ b/OpenAuth.Domain/Core/Module.cs @@ -1,83 +1,83 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a CodeSmith Template. -// -// DO NOT MODIFY contents of this file. Changes to this -// file will be lost if the code is regenerated. -// Author:Yubao Li -// -//------------------------------------------------------------------------------ - -using System; - -namespace OpenAuth.Domain -{ - /// - /// 功能模块表 - /// - public partial class Module:Entity - { - public Module() - { - this.CascadeId= string.Empty; - this.Name= string.Empty; - this.Url= string.Empty; - this.HotKey= string.Empty; - this.IconName= string.Empty; - this.Status= 0; - this.ParentName= string.Empty; - this.Vector= string.Empty; - this.SortNo= 0; - } - - /// - /// 节点语义ID - /// - public string CascadeId { get; set; } - /// - /// 功能模块名称 - /// - public string Name { get; set; } - /// - /// 主页面URL - /// - public string Url { get; set; } - /// - /// 热键 - /// - public string HotKey { get; set; } - /// - /// 父节点流水号 - /// - public Guid? ParentId { get; set; } - /// - /// 是否叶子节点 - /// - public bool IsLeaf { get; set; } - /// - /// 是否自动展开 - /// - public bool IsAutoExpand { get; set; } - /// - /// 节点图标文件名称 - /// - public string IconName { get; set; } - /// - /// 当前状态 - /// - public int Status { get; set; } - /// - /// 父节点名称 - /// - public string ParentName { get; set; } - /// - /// 矢量图标 - /// - public string Vector { get; set; } - /// - /// 排序号 - /// - public int SortNo { get; set; } - - } +//------------------------------------------------------------------------------ +// +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +// +//------------------------------------------------------------------------------ + +using System; + +namespace OpenAuth.Domain +{ + /// + /// 功能模块表 + /// + public partial class Module:Entity + { + public Module() + { + this.CascadeId= string.Empty; + this.Name= string.Empty; + this.Url= string.Empty; + this.HotKey= string.Empty; + this.IconName= string.Empty; + this.Status= 0; + this.ParentName= string.Empty; + this.Vector= string.Empty; + this.SortNo= 0; + } + + /// + /// 节点语义ID + /// + public string CascadeId { get; set; } + /// + /// 功能模块名称 + /// + public string Name { get; set; } + /// + /// 主页面URL + /// + public string Url { get; set; } + /// + /// 热键 + /// + public string HotKey { get; set; } + /// + /// 父节点流水号 + /// + public Guid? ParentId { get; set; } + /// + /// 是否叶子节点 + /// + public bool IsLeaf { get; set; } + /// + /// 是否自动展开 + /// + public bool IsAutoExpand { get; set; } + /// + /// 节点图标文件名称 + /// + public string IconName { get; set; } + /// + /// 当前状态 + /// + public int Status { get; set; } + /// + /// 父节点名称 + /// + public string ParentName { get; set; } + /// + /// 矢量图标 + /// + public string Vector { get; set; } + /// + /// 排序号 + /// + public int SortNo { get; set; } + + } } \ No newline at end of file diff --git a/OpenAuth.Domain/ModuleElement.cs b/OpenAuth.Domain/Core/ModuleElement.cs similarity index 96% rename from OpenAuth.Domain/ModuleElement.cs rename to OpenAuth.Domain/Core/ModuleElement.cs index 16f0df24..9de4abba 100644 --- a/OpenAuth.Domain/ModuleElement.cs +++ b/OpenAuth.Domain/Core/ModuleElement.cs @@ -1,75 +1,75 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a CodeSmith Template. -// -// DO NOT MODIFY contents of this file. Changes to this -// file will be lost if the code is regenerated. -// Author:Yubao Li -// -//------------------------------------------------------------------------------ - -using System; - -namespace OpenAuth.Domain -{ - /// - /// 模块元素表(需要权限控制的按钮) - /// - public partial class ModuleElement :Entity - { - public ModuleElement() - { - this.DomId= string.Empty; - this.Name= string.Empty; - this.Type= string.Empty; - this.Attr= string.Empty; - this.Script= string.Empty; - this.Icon= string.Empty; - this.Class= string.Empty; - this.Remark= string.Empty; - this.Sort= 0; - } - - /// - /// DOM ID - /// - public string DomId { get; set; } - /// - /// 名称 - /// - public string Name { get; set; } - /// - /// 类型 - /// - public string Type { get; set; } - /// - /// 元素附加属性 - /// - public string Attr { get; set; } - /// - /// 元素调用脚本 - /// - public string Script { get; set; } - /// - /// 元素图标 - /// - public string Icon { get; set; } - /// - /// 元素样式 - /// - public string Class { get; set; } - /// - /// 备注 - /// - public string Remark { get; set; } - /// - /// 排序字段 - /// - public int Sort { get; set; } - /// - /// - /// - public System.Guid ModuleId { get; set; } - - } +//------------------------------------------------------------------------------ +// +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +// +//------------------------------------------------------------------------------ + +using System; + +namespace OpenAuth.Domain +{ + /// + /// 模块元素表(需要权限控制的按钮) + /// + public partial class ModuleElement :Entity + { + public ModuleElement() + { + this.DomId= string.Empty; + this.Name= string.Empty; + this.Type= string.Empty; + this.Attr= string.Empty; + this.Script= string.Empty; + this.Icon= string.Empty; + this.Class= string.Empty; + this.Remark= string.Empty; + this.Sort= 0; + } + + /// + /// DOM ID + /// + public string DomId { get; set; } + /// + /// 名称 + /// + public string Name { get; set; } + /// + /// 类型 + /// + public string Type { get; set; } + /// + /// 元素附加属性 + /// + public string Attr { get; set; } + /// + /// 元素调用脚本 + /// + public string Script { get; set; } + /// + /// 元素图标 + /// + public string Icon { get; set; } + /// + /// 元素样式 + /// + public string Class { get; set; } + /// + /// 备注 + /// + public string Remark { get; set; } + /// + /// 排序字段 + /// + public int Sort { get; set; } + /// + /// + /// + public System.Guid ModuleId { get; set; } + + } } \ No newline at end of file diff --git a/OpenAuth.Domain/Org.cs b/OpenAuth.Domain/Core/Org.cs similarity index 96% rename from OpenAuth.Domain/Org.cs rename to OpenAuth.Domain/Core/Org.cs index 67409deb..6f26e901 100644 --- a/OpenAuth.Domain/Org.cs +++ b/OpenAuth.Domain/Core/Org.cs @@ -1,98 +1,98 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a CodeSmith Template. -// -// DO NOT MODIFY contents of this file. Changes to this -// file will be lost if the code is regenerated. -// Author:Yubao Li -// -//------------------------------------------------------------------------------ - -using System; - -namespace OpenAuth.Domain -{ - /// - /// 组织表 - /// - public partial class Org:Entity - { - public Org() - { - this.CascadeId= string.Empty; - this.Name= string.Empty; - this.HotKey= string.Empty; - this.ParentName= string.Empty; - this.IconName= string.Empty; - this.Status= 0; - this.Type= 0; - this.BizCode= string.Empty; - this.CustomCode= string.Empty; - this.CreateTime= DateTime.Now; - this.CreateId= 0; - this.SortNo= 0; - } - - /// - /// 节点语义ID - /// - public string CascadeId { get; set; } - /// - /// 组织名称 - /// - public string Name { get; set; } - /// - /// 热键 - /// - public string HotKey { get; set; } - /// - /// 父节点名称 - /// - public string ParentName { get; set; } - /// - /// 是否叶子节点 - /// - public bool IsLeaf { get; set; } - /// - /// 是否自动展开 - /// - public bool IsAutoExpand { get; set; } - /// - /// 节点图标文件名称 - /// - public string IconName { get; set; } - /// - /// 当前状态 - /// - public int Status { get; set; } - /// - /// 组织类型 - /// - public int Type { get; set; } - /// - /// 业务对照码 - /// - public string BizCode { get; set; } - /// - /// 自定义扩展码 - /// - public string CustomCode { get; set; } - /// - /// 创建时间 - /// - public System.DateTime CreateTime { get; set; } - /// - /// 创建人ID - /// - public int CreateId { get; set; } - /// - /// 排序号 - /// - public int SortNo { get; set; } - /// - /// 父节点流水号 - /// - public System.Guid? ParentId { get; set; } - - } +//------------------------------------------------------------------------------ +// +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +// +//------------------------------------------------------------------------------ + +using System; + +namespace OpenAuth.Domain +{ + /// + /// 组织表 + /// + public partial class Org:Entity + { + public Org() + { + this.CascadeId= string.Empty; + this.Name= string.Empty; + this.HotKey= string.Empty; + this.ParentName= string.Empty; + this.IconName= string.Empty; + this.Status= 0; + this.Type= 0; + this.BizCode= string.Empty; + this.CustomCode= string.Empty; + this.CreateTime= DateTime.Now; + this.CreateId= 0; + this.SortNo= 0; + } + + /// + /// 节点语义ID + /// + public string CascadeId { get; set; } + /// + /// 组织名称 + /// + public string Name { get; set; } + /// + /// 热键 + /// + public string HotKey { get; set; } + /// + /// 父节点名称 + /// + public string ParentName { get; set; } + /// + /// 是否叶子节点 + /// + public bool IsLeaf { get; set; } + /// + /// 是否自动展开 + /// + public bool IsAutoExpand { get; set; } + /// + /// 节点图标文件名称 + /// + public string IconName { get; set; } + /// + /// 当前状态 + /// + public int Status { get; set; } + /// + /// 组织类型 + /// + public int Type { get; set; } + /// + /// 业务对照码 + /// + public string BizCode { get; set; } + /// + /// 自定义扩展码 + /// + public string CustomCode { get; set; } + /// + /// 创建时间 + /// + public System.DateTime CreateTime { get; set; } + /// + /// 创建人ID + /// + public int CreateId { get; set; } + /// + /// 排序号 + /// + public int SortNo { get; set; } + /// + /// 父节点流水号 + /// + public System.Guid? ParentId { get; set; } + + } } \ No newline at end of file diff --git a/OpenAuth.Domain/Relevance.cs b/OpenAuth.Domain/Core/Relevance.cs similarity index 96% rename from OpenAuth.Domain/Relevance.cs rename to OpenAuth.Domain/Core/Relevance.cs index e957781d..0293dbe4 100644 --- a/OpenAuth.Domain/Relevance.cs +++ b/OpenAuth.Domain/Core/Relevance.cs @@ -1,59 +1,59 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a CodeSmith Template. -// -// DO NOT MODIFY contents of this file. Changes to this -// file will be lost if the code is regenerated. -// Author:Yubao Li -// -//------------------------------------------------------------------------------ - -using System; - -namespace OpenAuth.Domain -{ - /// - /// 多对多关系集中映射 - /// - public partial class Relevance :Entity - { - public Relevance() - { - this.Description= string.Empty; - this.Key= string.Empty; - this.Status= 0; - this.OperateTime= DateTime.Now; - this.OperatorId= 0; - } - - /// - /// 描述 - /// - public string Description { get; set; } - /// - /// - /// - public string Key { get; set; } - /// - /// 状态 - /// - public int Status { get; set; } - /// - /// 授权时间 - /// - public System.DateTime OperateTime { get; set; } - /// - /// 授权人 - /// - public int OperatorId { get; set; } - /// - /// 第一个表主键ID - /// - public System.Guid FirstId { get; set; } - /// - /// 第二个表主键ID - /// - public System.Guid SecondId { get; set; } - - } +//------------------------------------------------------------------------------ +// +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +// +//------------------------------------------------------------------------------ + +using System; + +namespace OpenAuth.Domain +{ + /// + /// 多对多关系集中映射 + /// + public partial class Relevance :Entity + { + public Relevance() + { + this.Description= string.Empty; + this.Key= string.Empty; + this.Status= 0; + this.OperateTime= DateTime.Now; + this.OperatorId= 0; + } + + /// + /// 描述 + /// + public string Description { get; set; } + /// + /// + /// + public string Key { get; set; } + /// + /// 状态 + /// + public int Status { get; set; } + /// + /// 授权时间 + /// + public System.DateTime OperateTime { get; set; } + /// + /// 授权人 + /// + public int OperatorId { get; set; } + /// + /// 第一个表主键ID + /// + public System.Guid FirstId { get; set; } + /// + /// 第二个表主键ID + /// + public System.Guid SecondId { get; set; } + + } } \ No newline at end of file diff --git a/OpenAuth.Domain/Resource.cs b/OpenAuth.Domain/Core/Resource.cs similarity index 96% rename from OpenAuth.Domain/Resource.cs rename to OpenAuth.Domain/Core/Resource.cs index 33dd0f04..b148e11e 100644 --- a/OpenAuth.Domain/Resource.cs +++ b/OpenAuth.Domain/Core/Resource.cs @@ -1,64 +1,64 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a CodeSmith Template. -// -// DO NOT MODIFY contents of this file. Changes to this -// file will be lost if the code is regenerated. -// Author:Yubao Li -// -//------------------------------------------------------------------------------ - -using System; - -namespace OpenAuth.Domain -{ - /// - /// 资源表 - /// - public partial class Resource :Entity - { - public Resource() - { - this.CascadeId= string.Empty; - this.Key= string.Empty; - this.Name= string.Empty; - this.Status= 0; - this.SortNo= 0; - this.Description= string.Empty; - } - - /// - /// 节点语义ID - /// - public string CascadeId { get; set; } - /// - /// - /// - public string Key { get; set; } - /// - /// 名称 - /// - public string Name { get; set; } - /// - /// 当前状态 - /// - public int Status { get; set; } - /// - /// 排序号 - /// - public int SortNo { get; set; } - /// - /// 资源分类 - /// - public Guid? CategoryId { get; set; } - /// - /// 描述 - /// - public string Description { get; set; } - /// - /// 父节点流水号 - /// - public System.Guid? ParentId { get; set; } - - } +//------------------------------------------------------------------------------ +// +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +// +//------------------------------------------------------------------------------ + +using System; + +namespace OpenAuth.Domain +{ + /// + /// 资源表 + /// + public partial class Resource :Entity + { + public Resource() + { + this.CascadeId= string.Empty; + this.Key= string.Empty; + this.Name= string.Empty; + this.Status= 0; + this.SortNo= 0; + this.Description= string.Empty; + } + + /// + /// 节点语义ID + /// + public string CascadeId { get; set; } + /// + /// + /// + public string Key { get; set; } + /// + /// 名称 + /// + public string Name { get; set; } + /// + /// 当前状态 + /// + public int Status { get; set; } + /// + /// 排序号 + /// + public int SortNo { get; set; } + /// + /// 资源分类 + /// + public Guid? CategoryId { get; set; } + /// + /// 描述 + /// + public string Description { get; set; } + /// + /// 父节点流水号 + /// + public System.Guid? ParentId { get; set; } + + } } \ No newline at end of file diff --git a/OpenAuth.Domain/Role.cs b/OpenAuth.Domain/Core/Role.cs similarity index 96% rename from OpenAuth.Domain/Role.cs rename to OpenAuth.Domain/Core/Role.cs index 86b04343..92e034de 100644 --- a/OpenAuth.Domain/Role.cs +++ b/OpenAuth.Domain/Core/Role.cs @@ -1,51 +1,51 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a CodeSmith Template. -// -// DO NOT MODIFY contents of this file. Changes to this -// file will be lost if the code is regenerated. -// Author:Yubao Li -// -//------------------------------------------------------------------------------ - -using System; - -namespace OpenAuth.Domain -{ - /// - /// 角色表 - /// - public partial class Role :Entity - { - public Role() - { - this.Name= string.Empty; - this.Status= 0; - this.Type= 0; - this.CreateTime= DateTime.Now; - this.CreateId= string.Empty; - } - - /// - /// 角色名称 - /// - public string Name { get; set; } - /// - /// 当前状态 - /// - public int Status { get; set; } - /// - /// 角色类型 - /// - public int Type { get; set; } - /// - /// 创建时间 - /// - public System.DateTime CreateTime { get; set; } - /// - /// 创建人ID - /// - public string CreateId { get; set; } - - } +//------------------------------------------------------------------------------ +// +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +// +//------------------------------------------------------------------------------ + +using System; + +namespace OpenAuth.Domain +{ + /// + /// 角色表 + /// + public partial class Role :Entity + { + public Role() + { + this.Name= string.Empty; + this.Status= 0; + this.Type= 0; + this.CreateTime= DateTime.Now; + this.CreateId= string.Empty; + } + + /// + /// 角色名称 + /// + public string Name { get; set; } + /// + /// 当前状态 + /// + public int Status { get; set; } + /// + /// 角色类型 + /// + public int Type { get; set; } + /// + /// 创建时间 + /// + public System.DateTime CreateTime { get; set; } + /// + /// 创建人ID + /// + public string CreateId { get; set; } + + } } \ No newline at end of file diff --git a/OpenAuth.Domain/Stock.cs b/OpenAuth.Domain/Core/Stock.cs similarity index 100% rename from OpenAuth.Domain/Stock.cs rename to OpenAuth.Domain/Core/Stock.cs diff --git a/OpenAuth.Domain/Core/User.cs b/OpenAuth.Domain/Core/User.cs index 6ea135f7..0ed7b3eb 100644 --- a/OpenAuth.Domain/Core/User.cs +++ b/OpenAuth.Domain/Core/User.cs @@ -1,19 +1,69 @@ -using System; +//------------------------------------------------------------------------------ +// +// This code was generated by a CodeSmith Template. +// +// DO NOT MODIFY contents of this file. Changes to this +// file will be lost if the code is regenerated. +// Author:Yubao Li +// +//------------------------------------------------------------------------------ + +using System; namespace OpenAuth.Domain { - /// - /// 用户ID + /// + /// /// - public partial class User - { - public void CheckPassword(string password) - { - if (Password != password) - { - throw new Exception("密码错误"); - } - } + public partial class User :Entity + { + public User() + { + this.Account= string.Empty; + this.Password= string.Empty; + this.Name= string.Empty; + this.Sex= 0; + this.Status= 0; + this.Type= 0; + this.BizCode= string.Empty; + this.CreateTime= DateTime.Now; + } - } -} \ No newline at end of file + /// + /// + /// + public string Account { get; set; } + /// + /// + /// + public string Password { get; set; } + /// + /// + /// + public string Name { get; set; } + /// + /// + /// + public int Sex { get; set; } + /// + /// + /// + public int Status { get; set; } + /// + /// + /// + public int Type { get; set; } + /// + /// + /// + public string BizCode { get; set; } + /// + /// + /// + public System.DateTime CreateTime { get; set; } + /// + /// + /// + public System.Guid? CrateId { get; set; } + } +} \ No newline at end of file diff --git a/OpenAuth.Domain/Core/UserExt.cs b/OpenAuth.Domain/Core/UserExt.cs new file mode 100644 index 00000000..f3256411 --- /dev/null +++ b/OpenAuth.Domain/Core/UserExt.cs @@ -0,0 +1,19 @@ +using System; + +namespace OpenAuth.Domain +{ + /// + /// 用户ID + /// + public static class UserExt + { + public static void CheckPassword(this User user, string password) + { + if (user.Password != password) + { + throw new Exception("密码错误"); + } + } + + } +} \ No newline at end of file diff --git a/OpenAuth.Domain/WorkflowScheme.cs b/OpenAuth.Domain/Core/WorkflowScheme.cs similarity index 100% rename from OpenAuth.Domain/WorkflowScheme.cs rename to OpenAuth.Domain/Core/WorkflowScheme.cs diff --git a/OpenAuth.Domain/OpenAuth.Domain.csproj b/OpenAuth.Domain/OpenAuth.Domain.csproj index 0c4144be..978e8d2d 100644 --- a/OpenAuth.Domain/OpenAuth.Domain.csproj +++ b/OpenAuth.Domain/OpenAuth.Domain.csproj @@ -42,13 +42,13 @@ - - - - - - - + + + + + + + @@ -60,13 +60,13 @@ - - - + + + - - - + + + @@ -74,9 +74,17 @@ - - - + + + + + + + + + + + diff --git a/OpenAuth.Mvc/Content/plugins/ckeditor/plugins/wsc/dialogs/tmpFrameset.html b/OpenAuth.Mvc/Content/scripts/plugins/ckeditor/plugins/wsc/dialogs/tmpFrameset.html similarity index 96% rename from OpenAuth.Mvc/Content/plugins/ckeditor/plugins/wsc/dialogs/tmpFrameset.html rename to OpenAuth.Mvc/Content/scripts/plugins/ckeditor/plugins/wsc/dialogs/tmpFrameset.html index 0d675f4d..c2d82aa4 100644 --- a/OpenAuth.Mvc/Content/plugins/ckeditor/plugins/wsc/dialogs/tmpFrameset.html +++ b/OpenAuth.Mvc/Content/scripts/plugins/ckeditor/plugins/wsc/dialogs/tmpFrameset.html @@ -1,6 +1,6 @@ diff --git a/OpenAuth.Mvc/Content/plugins/ckeditor/plugins/wsc/dialogs/wsc.css b/OpenAuth.Mvc/Content/scripts/plugins/ckeditor/plugins/wsc/dialogs/wsc.css similarity index 94% rename from OpenAuth.Mvc/Content/plugins/ckeditor/plugins/wsc/dialogs/wsc.css rename to OpenAuth.Mvc/Content/scripts/plugins/ckeditor/plugins/wsc/dialogs/wsc.css index 9e834f1d..496d7312 100644 --- a/OpenAuth.Mvc/Content/plugins/ckeditor/plugins/wsc/dialogs/wsc.css +++ b/OpenAuth.Mvc/Content/scripts/plugins/ckeditor/plugins/wsc/dialogs/wsc.css @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ diff --git a/OpenAuth.Mvc/Content/plugins/ckeditor/skins/moono/icons_hidpi.png b/OpenAuth.Mvc/Content/scripts/plugins/ckeditor/skins/moono/icons_hidpi.png similarity index 100% rename from OpenAuth.Mvc/Content/plugins/ckeditor/skins/moono/icons_hidpi.png rename to OpenAuth.Mvc/Content/scripts/plugins/ckeditor/skins/moono/icons_hidpi.png diff --git a/OpenAuth.Mvc/Content/plugins/ckeditor/skins/moono/images/hidpi/lock-open.png b/OpenAuth.Mvc/Content/scripts/plugins/ckeditor/skins/moono/images/hidpi/lock-open.png similarity index 61% rename from OpenAuth.Mvc/Content/plugins/ckeditor/skins/moono/images/hidpi/lock-open.png rename to OpenAuth.Mvc/Content/scripts/plugins/ckeditor/skins/moono/images/hidpi/lock-open.png index aa5e740e..edbd12f3 100644 Binary files a/OpenAuth.Mvc/Content/plugins/ckeditor/skins/moono/images/hidpi/lock-open.png and b/OpenAuth.Mvc/Content/scripts/plugins/ckeditor/skins/moono/images/hidpi/lock-open.png differ diff --git a/OpenAuth.Mvc/Content/scripts/plugins/tree/images/icons/s.gif b/OpenAuth.Mvc/Content/scripts/plugins/tree/images/icons/s.gif new file mode 100644 index 00000000..1d11fa9a Binary files /dev/null and b/OpenAuth.Mvc/Content/scripts/plugins/tree/images/icons/s.gif differ diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index 5ba369f2..c5905532 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -150,6 +150,8 @@ + + @@ -177,6 +179,13 @@ + + + + + + + @@ -276,6 +285,11 @@ + + + + + @@ -383,7 +397,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -393,238 +453,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1098,6 +926,15 @@ + + + + + + + + + @@ -1106,6 +943,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1125,7 +1028,558 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1190,14 +1644,6 @@ - - - - - - - - @@ -1402,6 +1848,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1429,9 +1899,12 @@ + + + @@ -1500,17 +1973,17 @@ - - \ No newline at end of file diff --git a/OpenAuth.Repository/Models/OpenAuthDBContext.cs b/OpenAuth.Repository/Models/OpenAuthDBContext.cs index ae003cc3..bd0559d4 100644 --- a/OpenAuth.Repository/Models/OpenAuthDBContext.cs +++ b/OpenAuth.Repository/Models/OpenAuthDBContext.cs @@ -10,7 +10,6 @@ using System.Data.Entity; using OpenAuth.Domain; using OpenAuth.Repository.Models.Mapping; -using OpenAuth.Repository.Workflow.Mapping; namespace OpenAuth.Repository.Models { @@ -28,10 +27,11 @@ namespace OpenAuth.Repository.Models : base(nameOrConnectionString) { } + public System.Data.Entity.DbSet ApplyTransitionHistories { get; set; } public System.Data.Entity.DbSet Categories { get; set; } + public System.Data.Entity.DbSet CommonApplies { get; set; } public System.Data.Entity.DbSet DicDetails { get; set; } public System.Data.Entity.DbSet DicIndices { get; set; } - public System.Data.Entity.DbSet GoodsApplies { get; set; } public System.Data.Entity.DbSet Modules { get; set; } public System.Data.Entity.DbSet ModuleElements { get; set; } public System.Data.Entity.DbSet Orgs { get; set; } @@ -40,17 +40,21 @@ namespace OpenAuth.Repository.Models public System.Data.Entity.DbSet Roles { get; set; } public System.Data.Entity.DbSet Stocks { get; set; } public System.Data.Entity.DbSet Users { get; set; } - - public DbSet ApplyTransitionHistories { get; set; } - - public System.Data.Entity.DbSet WorkflowSchemes { get; set; } + public System.Data.Entity.DbSet WFFrmMains { get; set; } + public System.Data.Entity.DbSet WFProcessInstances { get; set; } + public System.Data.Entity.DbSet WFProcessOperationHistories { get; set; } + public System.Data.Entity.DbSet WFProcessSchemes { get; set; } + public System.Data.Entity.DbSet WFProcessTransitionHistories { get; set; } + public System.Data.Entity.DbSet WFSchemeContents { get; set; } + public System.Data.Entity.DbSet WFSchemeInfos { get; set; } protected override void OnModelCreating(DbModelBuilder modelBuilder) { + modelBuilder.Configurations.Add(new ApplyTransitionHistoryMap()); modelBuilder.Configurations.Add(new CategoryMap()); + modelBuilder.Configurations.Add(new CommonApplyMap()); modelBuilder.Configurations.Add(new DicDetailMap()); modelBuilder.Configurations.Add(new DicIndexMap()); - modelBuilder.Configurations.Add(new CommonApplyMap()); modelBuilder.Configurations.Add(new ModuleMap()); modelBuilder.Configurations.Add(new ModuleElementMap()); modelBuilder.Configurations.Add(new OrgMap()); @@ -59,9 +63,13 @@ namespace OpenAuth.Repository.Models modelBuilder.Configurations.Add(new RoleMap()); modelBuilder.Configurations.Add(new StockMap()); modelBuilder.Configurations.Add(new UserMap()); - modelBuilder.Configurations.Add(new ApplyTransitionHistoryMap()); - modelBuilder.Configurations.Add(new WorkflowSchemeMap()); - + modelBuilder.Configurations.Add(new WFFrmMainMap()); + modelBuilder.Configurations.Add(new WFProcessInstanceMap()); + modelBuilder.Configurations.Add(new WFProcessOperationHistoryMap()); + modelBuilder.Configurations.Add(new WFProcessSchemeMap()); + modelBuilder.Configurations.Add(new WFProcessTransitionHistoryMap()); + modelBuilder.Configurations.Add(new WFSchemeContentMap()); + modelBuilder.Configurations.Add(new WFSchemeInfoMap()); } } } \ No newline at end of file diff --git a/OpenAuth.Repository/OpenAuth.Repository.csproj b/OpenAuth.Repository/OpenAuth.Repository.csproj index e4e9438d..c66afd25 100644 --- a/OpenAuth.Repository/OpenAuth.Repository.csproj +++ b/OpenAuth.Repository/OpenAuth.Repository.csproj @@ -57,6 +57,13 @@ + + + + + + + diff --git a/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj b/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj index 0b91b931..63239a67 100644 --- a/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj +++ b/OpenAuth.UnitTest/OpenAuth.UnitTest.csproj @@ -127,6 +127,7 @@ +