lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-04-05 17:38:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '4.0' of https://gitee.com/yubaolee/OpenAuth.Net into 4.0

Browse Source
This commit is contained in:
yubao 2018-06-09 07:01:54 +08:00
commit a9ca19bc0c
5 changed files with 54 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
CodeSmith/CSharp/Web/Application.cst
View File

@ -28,40 +28,10 @@ namespace OpenAuth.App
/// </summary>
public TableData Load(Query<%=ModuleName%>ListReq request)
{
var loginUser = AuthUtil.GetCurrentUser();
string cascadeId = ".0.";
if (!string.IsNullOrEmpty(request.orgId))
return new TableData
{
var org = loginUser.Orgs.SingleOrDefault(u => u.Id == request.orgId);
cascadeId = org.CascadeId;
}
var ids = loginUser.Orgs.Where(u => u.CascadeId.Contains(cascadeId)).Select(u => u.Id).ToArray();
var roleIds = ReleManagerApp.Get(Define.ROLEORG, false, ids);
var roles = UnitWork.Find<<%=ModuleName%>>(u => roleIds.Contains(u.Id))
.OrderBy(u => u.Name)
.Skip((request.page - 1) * request.limit)
.Take(request.limit);
var records = Repository.GetCount(u => roleIds.Contains(u.Id));
var roleViews = new List<<%=ModuleName%>View>();
foreach (var role in roles)
{
RoleView uv = role;
var orgs = LoadByRole(role.Id);
uv.Organizations = string.Join(",", orgs.Select(u => u.Name).ToList());
uv.OrganizationIds = string.Join(",", orgs.Select(u => u.Id).ToList());
roleViews.Add(uv);
}
return new TableData
{
count = records,
data = roleViews,
count = Repository.GetCount(null),
data = Repository.Find(request.page, request.limit, "Id desc")
};
}
@ -74,7 +44,7 @@ namespace OpenAuth.App
{
UnitWork.Update<<%=ModuleName%>>(u => u.Id == obj.Id, u => new <%=ModuleName%>
{
//todo:要修改的
//todo:要修改的字段赋值
});
}

17
CodeSmith/CSharp/Web/Request.cst Normal file
View File

@ -0,0 +1,17 @@
<%--
Name: Database Table Properties
Author: yubaolee
Description: Create a list of properties from a database table
--%>
<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="False" Description="应用层" %>
<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %>
<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %>
<%@ Assembly Name="SchemaExplorer" %>
<%@ Import Namespace="SchemaExplorer" %>
namespace OpenAuth.App.Request
{
public class Query<%=ModuleName%>ListReq : PageReq
{
public string orgId { get; set; }
}
}

23
CodeSmith/CSharp/WebGenerate.cst
View File

@ -39,6 +39,9 @@ OnChanged="OnSourceDatabaseChanged"%>
<%@ Register Name="ApplicationGenerateClass"
Template="Web\Application.cst"
MergeProperties="False" %>
<%@ Register Name="RequestGenerateClass"
Template="Web\Request.cst"
MergeProperties="False" %>
<%@ Register Name="HtmlGenerateClass"
Template="Web\Index.cshtml.cst"
MergeProperties="False" %>
@ -59,6 +62,7 @@ Generating Entities ...
CreateControllerClass();
CreateApplicationClass();
CreateReqClass();
CreateHtmlClass();
CreateJSClass();
@ -103,6 +107,23 @@ Generating Entities ...
Response.WriteLine(generatedFile);
generatedClass.RenderToFile(generatedFile, generatedFile, true);
}
//创建请求参数,如QueryUserListReq.cs
public void CreateReqClass()
{
RequestGenerateClass generatedClass = this.Create<RequestGenerateClass>();
this.CopyPropertiesTo(generatedClass);
string rootDirectory = Path.GetFullPath(directory);
string generatedFile = Path.GetFullPath(directory) + "/APP/Request/Query"+ ModuleName + "ListReq.cs";
generatedClass.ModuleName = ModuleName;
Response.WriteLine(generatedFile);
generatedClass.RenderToFile(generatedFile, generatedFile, true);
}
//创建视图,如views/Users/index.html
public void CreateHtmlClass()
@ -125,7 +146,7 @@ Generating Entities ...
JSGenerateClass generatedClass = this.Create<JSGenerateClass>();
this.CopyPropertiesTo(generatedClass);
string generatedFile = Path.GetFullPath(directory) + "/userJs/"+ModuleName+"s.js";
string generatedFile = Path.GetFullPath(directory) + "/userJs/"+ModuleName.ToLower()+"s.js";
generatedClass.ModuleName = ModuleName;

11
OpenAuth.Mvc/Controllers/BaseController.cs
View File

@ -32,7 +32,6 @@ namespace OpenAuth.Mvc.Controllers
public class BaseController : SSOController
{
protected Response Result = new Response();
protected ModuleView CurrentModule;
protected string Controllername; //当前控制器小写名称
protected string Actionname; //当前Action小写名称
@ -48,11 +47,15 @@ namespace OpenAuth.Mvc.Controllers
var function = this.GetType().GetMethods().FirstOrDefault(u => u.Name.ToLower() == Actionname);
if (function == null)
throw new Exception("未能找到Action");
//权限验证标识
var authorize = function.GetCustomAttribute(typeof(AuthenticateAttribute));
CurrentModule = AuthUtil.GetCurrentUser().Modules.FirstOrDefault(u => u.Url.ToLower().Contains(Controllername));
if (authorize == null)
{
return;
}
var currentModule = AuthUtil.GetCurrentUser().Modules.FirstOrDefault(u => u.Url.ToLower().Contains(Controllername));
//当前登录用户没有Action记录&&Action有authenticate标识
if (authorize != null && CurrentModule == null)
if ( currentModule == null)
{
filterContext.Result = new RedirectResult("/Login/Index");
return;

5
OpenAuth.WebApi/Areas/SSO/Controllers/CheckController.cs
View File

@ -10,6 +10,7 @@
// ***********************************************************************
using System;
using System.Data.Entity.Core;
using System.Web.Http;
using Infrastructure;
using Infrastructure.Cache;
@ -71,7 +72,9 @@ namespace OpenAuth.WebApi.Areas.SSO.Controllers
catch (Exception ex)
{
result.Code = 500;
result.Message ="OpenAuth.WebAPI数据库访问失败:" + ex.Message;
result.Message = ex.InnerException != null
? "OpenAuth.WebAPI数据库访问失败:" + ex.InnerException.Message
: "OpenAuth.WebAPI数据库访问失败:" + ex.Message;
}
return result;