lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-11-08 10:24:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化autofac注入方式，Controller使用属性注入

Browse Source
This commit is contained in:
yubaolee
2017-03-24 15:35:52 +08:00
parent 9122bec093
commit 96a9ee6bd2
20 changed files with 1948 additions and 2029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowDesignController.cs
View File

@@ -21,14 +21,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
/// </summary>
public class FlowDesignController :BaseController
{
private WFSchemeService wfFlowInfoBLL;
private UserManagerApp userBLL;
public FlowDesignController()
{
wfFlowInfoBLL = AutofacExt.GetFromFac<WFSchemeService>();
userBLL = AutofacExt.GetFromFac<UserManagerApp>();
}
public WFSchemeService WfFlowInfoBll { get; set; }
#region 视图功能
/// <summary>
@@ -100,8 +93,8 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpGet]
public ActionResult GetFormJson(Guid keyValue)
{
var schemeinfo = wfFlowInfoBLL.GetEntity(keyValue);
var schemecontent = wfFlowInfoBLL.GetSchemeEntity(schemeinfo.Id, schemeinfo.SchemeVersion);
var schemeinfo = WfFlowInfoBll.GetEntity(keyValue);
var schemecontent = WfFlowInfoBll.GetSchemeEntity(schemeinfo.Id, schemeinfo.SchemeVersion);
var JsonData = new
{
schemeinfo = schemeinfo,
@@ -118,7 +111,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpGet]
public ActionResult GetSchemeContentJson(Guid keyValue, string SchemeVersion)
{
var schemecontent = wfFlowInfoBLL.GetSchemeEntity(keyValue, SchemeVersion);
var schemecontent = WfFlowInfoBll.GetSchemeEntity(keyValue, SchemeVersion);
return Content(schemecontent.ToJson());
}
#endregion
@@ -132,7 +125,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpPost]
public string RemoveForm(Guid[] ids)
{
wfFlowInfoBLL.RemoveForm(ids);
WfFlowInfoBll.RemoveForm(ids);
return Result.ToJson();
}
/// <summary>
@@ -146,7 +139,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
{
WFSchemeInfo entyity = InfoEntity.ToObject<WFSchemeInfo>();
WFSchemeContent contententity = ContentEntity.ToObject<WFSchemeContent>();
wfFlowInfoBLL.SaveForm(keyValue, entyity, contententity);
WfFlowInfoBll.SaveForm(keyValue, entyity, contententity);
return Result.ToJson();
}
/// <summary>
@@ -159,13 +152,13 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
public ActionResult SubmitUpdateState(string keyValue, int State)
{
wfFlowInfoBLL.UpdateState(keyValue, State);
WfFlowInfoBll.UpdateState(keyValue, State);
return Content("操作成功。");
}
public string Load(int pageCurrent = 1, int pageSize = 30)
{
return JsonHelper.Instance.Serialize(wfFlowInfoBLL.Load(pageCurrent, pageSize));
return JsonHelper.Instance.Serialize(WfFlowInfoBll.Load(pageCurrent, pageSize));
}
#endregion

27
OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowInstancesController.cs
View File

@@ -14,12 +14,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
/// </summary>
public class FlowInstancesController : BaseController
{
private WFProcessInstanceService _app;
public FlowInstancesController()
{
_app = AutofacExt.GetFromFac<WFProcessInstanceService>();
}
public WFProcessInstanceService App { get; set; }
#region 视图
@@ -115,7 +110,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
WFProcessInstance wfProcessInstanceEntity = wfProcessInstanceJson.ToObject<WFProcessInstance>();
wfProcessInstanceEntity.Id = Guid.Empty;
_app.CreateInstance(Guid.NewGuid(), wfSchemeInfoId, wfProcessInstanceEntity, frmData);
App.CreateInstance(Guid.NewGuid(), wfSchemeInfoId, wfProcessInstanceEntity, frmData);
return Result.ToJson();
}
@@ -129,7 +124,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpPost]
public string VerificationProcess(Guid processId, string verificationData)
{
_app.VerificationProcess(processId, verificationData);
App.VerificationProcess(processId, verificationData);
return Result.ToJson();
}
@@ -142,7 +137,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
{
foreach (var id in ids)
{
_app.DeleteProcess(id);
App.DeleteProcess(id);
}
return Result.ToJson();
}
@@ -166,7 +161,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpGet]
public ActionResult GetProcessSchemeJson(Guid keyValue)
{
var data = _app.GetProcessSchemeEntity(keyValue);
var data = App.GetProcessSchemeEntity(keyValue);
return Content(data.ToJson());
}
@@ -178,7 +173,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpGet]
public ActionResult GetProcessSchemeEntityByUserId(Guid keyValue)
{
var data = _app.GetProcessSchemeByUserId(keyValue);
var data = App.GetProcessSchemeByUserId(keyValue);
return Content(data.ToJson());
}
@@ -191,7 +186,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpGet]
public ActionResult GetProcessSchemeEntityByNodeId(Guid keyValue, string nodeId)
{
var data = _app.GetProcessSchemeEntityByNodeId(keyValue, nodeId);
var data = App.GetProcessSchemeEntityByNodeId(keyValue, nodeId);
return Content(data.ToJson());
}
@@ -203,8 +198,8 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpGet]
public ActionResult GetProcessInfoJson(Guid keyValue)
{
var processInstance = _app.GetProcessInstanceEntity(keyValue);
var processScheme = _app.GetProcessSchemeEntity(processInstance.ProcessSchemeId);
var processInstance = App.GetProcessInstanceEntity(keyValue);
var processScheme = App.GetProcessSchemeEntity(processInstance.ProcessSchemeId);
var JsonData = new
{
processInstance = processInstance,
@@ -221,13 +216,13 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpGet]
public ActionResult GetProcessInstanceJson(Guid keyValue)
{
var processInstance = _app.GetProcessInstanceEntity(keyValue);
var processInstance = App.GetProcessInstanceEntity(keyValue);
return Content(processInstance.ToJson());
}
public string Load(string type, int pageCurrent = 1, int pageSize = 30)
{
return JsonHelper.Instance.Serialize(_app.Load(AuthUtil.GetCurrentUser().User.Id.ToString(), type, pageCurrent, pageSize));
return JsonHelper.Instance.Serialize(App.Load(AuthUtil.GetCurrentUser().User.Id.ToString(), type, pageCurrent, pageSize));
}
#endregion 获取数据(公用)

19
OpenAuth.Mvc/Areas/FlowManage/Controllers/FormDesignController.cs
View File

@@ -13,12 +13,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
public class FormDesignController : BaseController
{
private readonly WFFormService _wfFrmMainBll;
public FormDesignController()
{
_wfFrmMainBll = AutofacExt.GetFromFac<WFFormService>();
}
public WFFormService WfFrmMainBll { get; set; }
#region 视图功能
/// <summary>
@@ -55,7 +50,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
public string Load(int pageCurrent = 1, int pageSize = 30)
{
return JsonHelper.Instance.Serialize(_wfFrmMainBll.Load(pageCurrent, pageSize));
return JsonHelper.Instance.Serialize(WfFrmMainBll.Load(pageCurrent, pageSize));
}
/// <summary>
@@ -66,7 +61,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpGet]
public ActionResult GetTreeJson()
{
var data = _wfFrmMainBll.GetAllList();
var data = WfFrmMainBll.GetAllList();
var treeList = new List<TreeEntity>();
foreach (var item in data)
{
@@ -95,7 +90,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpGet]
public ActionResult GetFormJson(Guid keyValue)
{
var data = _wfFrmMainBll.GetForm(keyValue);
var data = WfFrmMainBll.GetForm(keyValue);
return Content(data.ToJson());
}
@@ -106,7 +101,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpGet]
public ActionResult GetAllListJson()
{
var data = _wfFrmMainBll.GetAllList();
var data = WfFrmMainBll.GetAllList();
return Content(data.ToJson());
}
#endregion
@@ -120,7 +115,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
[HttpPost]
public string RemoveForm(Guid[] ids)
{
_wfFrmMainBll.RemoveForm(ids);
WfFrmMainBll.RemoveForm(ids);
return Result.ToJson();
}
///// <summary>
@@ -137,7 +132,7 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
var user = AuthUtil.GetCurrentUser();
userEntity.ModifyUserId = user.User.Account;
userEntity.ModifyUserName = user.User.Name;
_wfFrmMainBll.SaveForm(keyValue, userEntity);
WfFrmMainBll.SaveForm(keyValue, userEntity);
}
catch (Exception e)
{

8
OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowLineForm.cshtml
View File

@@ -15,12 +15,12 @@
InitControl();
});
function initLoadPageData() {
var _FlowDesignObject = top.FlowSchemeBuider.FlowDesignObject;
lineobject = _FlowDesignObject.$lineData[top.FlowSchemeBuider.LineId];
lineobject.id = top.FlowSchemeBuider.LineId;
var _FlowDesignObject = parent.FlowDesignObject;
lineobject = _FlowDesignObject.$lineData[parent.LineId];
lineobject.id = parent.LineId;
fromnode = _FlowDesignObject.$nodeData[lineobject.from];
frmtype = top.FlowSchemeBuider.postData["FrmType"];
frmtype = parent.postData["FrmType"];
if (frmtype == 0) {
frmCotent = JSON.parse(top.FlowSchemeBuider.frmData["FrmContent"]);
}