这是有史以来最艰难的一次提交,不生则死!

This commit is contained in:
yubao
2017-11-28 23:54:49 +08:00
parent 9c37623d7f
commit 6a3fa6fd3d
114 changed files with 779 additions and 2373 deletions

View File

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

View File

@@ -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);

View File

@@ -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
{

View File

@@ -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>可以为用户/角色分配同过keyUserElement/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));
}
}
}

View File

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

View File

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

View File

@@ -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);

View File

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

View File

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

View File

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

View File

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

View File

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