增加日志过滤器，调整审核接口-去掉任务id传输

WorkFlowApi/WorkFlowApi.Business/Scheme/WFProcessBusiness.cs

@@ -220,8 +220,8 @@ namespace WorkFlowApi.Business.Scheme
 
             // 获取下一节点信息
             List<WFLineInfo> lineList = new List<WFLineInfo>();
-            List<WFNodeInfo> list = nWFIEngine.GetNextTaskNode(nodeInfo, "agree", false, lineList);
-            string codelist = nWFIEngine.GetButonList(nodeInfo.id, lineList);
+            List<WFNodeInfo> list = nWFIEngine.GetNextTaskNode(nodeInfo, "agree", false, lineList, branchnodeCode);
+            string codelist = nWFIEngine.GetButonList(list.FirstOrDefault().id, lineList);
             // 创建任务
             List<T_WF_TaskView> taskList = _CreateTask(list, nodeInfo, nWFEngineParamConfig,codelist);
             List<T_WF_Task> taskListEntity = taskList.MapToList<T_WF_Task>();
@@ -383,12 +383,13 @@ namespace WorkFlowApi.Business.Scheme
             // 获取下一节点信息
             List<WFLineInfo> lineList = new List<WFLineInfo>();
             List<WFNodeInfo> list = nWFIEngine.GetNextTaskNode(nodeInfo, operationCode, false, lineList, branchnodeCode);
-            var codelist = string.Empty;
-            if (list != null && list.Count() > 0)
+           
+            if (list == null && list.Count() == 0)
             {
-               codelist = nWFIEngine.GetButonList(list.FirstOrDefault().id, lineList);
+                throw (new Exception("找不到对应流程任务！"));
+               
             }
-          
+            var codelist = nWFIEngine.GetButonList(list.FirstOrDefault().id, lineList);
 
 
             // 创建任务
@@ -759,25 +760,10 @@ namespace WorkFlowApi.Business.Scheme
 
             list.AddRange(list2);
 
-            //if (list.Count == 0)
-            //{// 未找到审核人，默认成系统管理员
-            //    if (nodeInfo.noPeopleGz == 3)
-            //    {
-            //        throw (new Exception("下一节点没有审核人,无法提交！"));
-            //    }
-            //    // 如果找不到审核人就默认超级管理员才能审核
-            //    var adminEntityList = user.GetList("F_RoleId=4", "");
-            //    foreach (var item in adminEntityList)
-            //    {
-            //        list.Add(new WFUserInfo()
-            //        {
-            //            Id = item.F_UserId.ToString(),
-            //            Account = item.F_UserCode,
-            //            Name = item.F_UserName,
-            //            noPeople = true
-            //        });
-            //    }
-            //}
+            if (list.Count == 0)
+            {
+                    throw (new Exception("下一节点没有审核人,无法提交！"));              
+            }
 
             return list;
         }

WorkFlowApi/WorkFlowApi.Models/Input/AuditFlowReq.cs

@@ -12,7 +12,6 @@ namespace WorkFlowApi.ViewModels.Input
         public string OperationCode { get; set; }
         public string OperationName { get; set; }
         public string ProcessId { get; set; }
-        public string TaskId { get; set; }
 
         public string BranchnodeCode { get; set; }
         public string Des { get; set; }

WorkFlowApi/WorkFlowApi.Models/View/NextTaskinfo.cs

@@ -15,32 +15,32 @@ namespace WorkFlowApi.ViewModels.View
         /// 主键 
         /// </summary> 
         /// <returns></returns> 
-        public string Id { get; set; }
+      //  public string Id { get; set; }
         /// <summary> 
         /// 流程实例主键 
         /// </summary> 
         /// <returns></returns> 
-        public string ProcessId { get; set; }
+     //   public string ProcessId { get; set; }
         /// <summary> 
         /// 流程节点ID 
         /// </summary> 
         /// <returns></returns> 
-        public string NodeId { get; set; }
+      //  public string NodeId { get; set; }
         /// <summary> 
         /// 流程节点名称 
         /// </summary> 
         /// <returns></returns> 
-        public string NodeName { get; set; }
+     //   public string NodeName { get; set; }
         /// <summary> 
         /// 任务类型1审批2传阅3加签4子流程5重新创建 
         /// </summary> 
         /// <returns></returns> 
-        public int? Type { get; set; }
+     //   public int? Type { get; set; }
         /// <summary> 
         /// 是否完成1完成2关闭0未完成 
         /// </summary> 
         /// <returns></returns> 
-        public int? IsFinished { get; set; }
+     //   public int? IsFinished { get; set; }
         public List<WFAuditor> auditors { get; set; }
 
         public string nodeType { get; set; }

WorkFlowApi/WorkFlowApi/App_Start/WebApiConfig.cs

@@ -16,6 +16,7 @@ namespace WorkFlowApi
             config.MapHttpAttributeRoutes();
             config.Filters.Add(new AuthorizeFilter());
             config.Filters.Add(new ExceptionFilter());
+            config.Filters.Add(new WebApiActionLogFilter());
 
             config.Routes.MapHttpRoute(
                 name: "DefaultApi",

WorkFlowApi/WorkFlowApi/Configs/system.config

@@ -12,7 +12,7 @@
   <!-- JWT-->
   <add key="JwtSecret" value="db3OIsj+BXE9NZDy0t8W3TcNekrF+2d/1sFnWG4HnV8TZYJHjsa7J9DfsaRabWvB1GlOgJuQZdcF2Luqm/hccMw==" />
   <!-- 是否开启全日志-->
-  <add key="IsLog" value="0" />
+  <add key="IsLog" value="1" />
   <!-- ================== 3：微信配置参数 ================== -->
   <!-- 设置微信appid -->
   <add key="WechatAppid" value="wxe03366d8c63d9b09" />

WorkFlowApi/WorkFlowApi/Controllers/WorkFlow/WFProcessController.cs

@@ -17,12 +17,14 @@ namespace WorkFlowApi.Controllers.WorkFlow
     public class WFProcessController : BaseController
     {
         private readonly IWFProcessBusiness _wFProcess;
+        private readonly IWFTaskBusiness _wFTaskBusiness;
         /// <summary>
         /// 构造函数
         /// </summary>
-        public WFProcessController(IWFProcessBusiness wFProcess)
+        public WFProcessController(IWFProcessBusiness wFProcess, IWFTaskBusiness wFTaskBusiness)
         {
             _wFProcess = wFProcess;
+            _wFTaskBusiness = wFTaskBusiness;
         }
         /// <summary>
         /// 创建流程实例
@@ -33,9 +35,7 @@ namespace WorkFlowApi.Controllers.WorkFlow
         public IHttpActionResult Create(CreateFlowReq  createFlowReq)
         {
  
-            try
-            {
-                LogHelper.Info("CreateFlow-请求开始:" + createFlowReq.ToJson() + "\n");
+
                 List<T_WF_TaskView>   t_WF_TaskViews = new List<T_WF_TaskView>();
                 if (createFlowReq.IsNew)
                 {
@@ -47,13 +47,8 @@ namespace WorkFlowApi.Controllers.WorkFlow
                 }
                 
                 return Success("创建成功", t_WF_TaskViews.MapToList<NextTaskinfo>());
-            }
-            catch (Exception ex)
-            {
-
-                LogHelper.Error("CreateFlow-请求异常:" + ex.Message + "\n");
-                return Error("系统异常");
-            }
+            
+     
         }
         /// <summary>
         /// 审批流程
@@ -64,9 +59,7 @@ namespace WorkFlowApi.Controllers.WorkFlow
         public IHttpActionResult Audit(AuditFlowReq  auditFlowReq)
         {
 
-            try
-            {
-                LogHelper.Info("AuditFlow-请求开始:" + auditFlowReq.ToJson() + "\n");
+       
                 List<T_WF_TaskView> t_WF_TaskViews = new List<T_WF_TaskView>();
                 if (auditFlowReq.OperationCode == "send"  )
                 {
@@ -75,15 +68,15 @@ namespace WorkFlowApi.Controllers.WorkFlow
                         return Error("派单未指定审核人");
                     }
                 }
-                _wFProcess.AuditFlow(auditFlowReq.OperationCode, auditFlowReq.OperationName, auditFlowReq.ProcessId, auditFlowReq.TaskId, auditFlowReq.Des, "","", auditFlowReq.BranchnodeCode, CurrentUser,out t_WF_TaskViews, auditFlowReq.auditors);
+                var taskEntiy = _wFTaskBusiness.GetList($"F_ProcessId='{auditFlowReq.ProcessId}'   AND F_IsFinished=0", "").FirstOrDefault();
+                if (taskEntiy == null)
+                {
+                    return Error("未找到对应流程任务");
+                }
+                _wFProcess.AuditFlow(auditFlowReq.OperationCode, auditFlowReq.OperationName, auditFlowReq.ProcessId, taskEntiy.F_Id, auditFlowReq.Des, "","", auditFlowReq.BranchnodeCode, CurrentUser,out t_WF_TaskViews, auditFlowReq.auditors);
                 return Success("流程审批成功", t_WF_TaskViews.MapToList<NextTaskinfo>());
-            }
-            catch (Exception ex)
-            {
-
-                LogHelper.Error("AuditFlow-请求异常:" + ex.Message + "\n");
-                return Error("系统异常");
-            }
+            
+       
         }
     }
 }

WorkFlowApi/WorkFlowApi/Controllers/WorkFlow/WFSchemeController.cs

@@ -40,8 +40,7 @@ namespace WorkFlowApi.Controllers.WorkFlow
         public IHttpActionResult GetEntityByCode(string code)
         {
 
-            try
-            {
+      
                 if (string.IsNullOrEmpty(code))
                 {
                     return Error("请求参数不正确");
@@ -49,12 +48,8 @@ namespace WorkFlowApi.Controllers.WorkFlow
                 var  infoEntityView = _wFSchemeInfo.GetEntityByCode(code);
                 return Success("成功", infoEntityView.MapTo<SchemeInfoAuditView>());
 
-            }
-            catch (Exception e)
-            {
-                LogHelper.Error("GetSchemeInfoPageList-请求异常:" + e.Message + "\n");
-                return Error("系统异常");
-            }
+            
+ 
 
         }
         /// <summary>
@@ -63,24 +58,19 @@ namespace WorkFlowApi.Controllers.WorkFlow
         [HttpPost]
         public IHttpActionResult GetListPage(GetSchemeInfoPageListReq  getSchemeInfoPageListReq)
         {
-            LogHelper.Info("GetSchemeInfoPageList-请求开始:"+getSchemeInfoPageListReq.ToJson()+"\n");
+         
             int total = 0;
-            try
-            {
+    
                 if (getSchemeInfoPageListReq == null)
                 {
                     return Error("请求参数不正确");
                 }
                 var list= _wFSchemeInfo.GetSchemeInfoPageList(getSchemeInfoPageListReq,out total);
-                LogHelper.Info("GetSchemeInfoPageList-请求结束:" + list.ToJson() + "\n");
+          
                 return Success("成功", list.MapToList<SchemeInfoView>(), total);
                
-            }
-            catch (Exception e)
-            {
-                LogHelper.Error("GetSchemeInfoPageList-请求异常:" + e.Message + "\n");
-                return Error("系统异常");
-            }
+            
+    
 
         }
         /// <summary>
@@ -91,24 +81,18 @@ namespace WorkFlowApi.Controllers.WorkFlow
         [HttpPost]
         public IHttpActionResult GetSchemePageList(GetSchemePageListReq getSchemePageListReq)
         {
-            LogHelper.Info("GetSchemePageList-请求开始:" + getSchemePageListReq.ToJson() + "\n");
+         
             int total = 0;
-            try
-            {
+     
                 if (getSchemePageListReq == null)
                 {
                     return Error("请求参数不正确");
                 }
                 var list = _wFSchemeInfo.GetSchemePageList(getSchemePageListReq, out total);
-                LogHelper.Info("GetSchemePageList-请求结束:" + list.ToJson() + "\n");
+            
                 return Success("成功", list, total);
 
-            }
-            catch (Exception e)
-            {
-                LogHelper.Error("GetSchemePageList-请求异常:" + e.Message + "\n");
-                return Error("系统异常");
-            }
+  
 
         }
         /// <summary>
@@ -119,9 +103,9 @@ namespace WorkFlowApi.Controllers.WorkFlow
         [HttpPost]
         public IHttpActionResult Save(SaveSchemeInfoReq  saveSchemeInfoReq)
         {
-            LogHelper.Info("SaveSchemeInfo-请求开始:" + saveSchemeInfoReq.ToJson() + "\n");
-            try
-            {
+         
+         
+        
                 T_WF_SchemeInfo t_WF_SchemeInfo = saveSchemeInfoReq.schemeInfo.MapTo<T_WF_SchemeInfo>();
                 // 验证流程编码是否重复
               
@@ -132,14 +116,9 @@ namespace WorkFlowApi.Controllers.WorkFlow
                 }
               
                 _wFSchemeInfo.SaveSchemeInfo(saveSchemeInfoReq, CurrentUser);
-                LogHelper.Info("SaveSchemeInfo-请求结束:" + "保存成功" + "\n");
+       
                 return Success("保存成功");
-            }
-            catch (Exception e)
-            {
-                LogHelper.Error("SaveSchemeInfo-请求异常:" + e.Message + "\n");
-                return Error("系统异常");
-            }
+     
         }
 
         /// <summary>
@@ -150,18 +129,12 @@ namespace WorkFlowApi.Controllers.WorkFlow
  
         public IHttpActionResult Delete(string keyValue)
         {
-            LogHelper.Info("DeleteSchemeInfo-请求开始:" + keyValue + "\n");
-            try
-            {
+         
+          
                 _wFSchemeInfo.DeleteSchemeInfo(keyValue, CurrentUser);
-                LogHelper.Info("DeleteSchemeInfo-请求结束:" + "删除成功" + "\n");
+           
                 return Success("删除成功");
-            }
-            catch (Exception e)
-            {
-                LogHelper.Error("DeleteSchemeInfo-请求异常:" + e.Message + "\n");
-                return Error("系统异常");
-            }
+       
         }
         /// <summary>
         /// 启用/停用
@@ -171,18 +144,13 @@ namespace WorkFlowApi.Controllers.WorkFlow
         /// <returns></returns>
         public IHttpActionResult UpdateState(string keyValue,int state)
         {
-            LogHelper.Info("UpdateState-请求开始:" + keyValue+":"+ state + "\n");
-            try
-            {
+         
+        
                 _wFSchemeInfo.UpdateState(keyValue, state, CurrentUser);
-                LogHelper.Info("UpdateState-请求结束:" +"操作成功" + "\n");
+           
                 return Success((state == 1 ? "启用" : "禁用") + "成功！");
-            }
-            catch (Exception e)
-            {
-                LogHelper.Error("UpdateState-请求异常:" +e.Message + "\n");
-                return Error("系统异常");
-            }
+          
+       
         }
         /// <summary>
         /// 更新模板版本
@@ -192,18 +160,12 @@ namespace WorkFlowApi.Controllers.WorkFlow
         /// <returns></returns>
         public IHttpActionResult UpdateScheme(string schemeInfoId, string schemeId)
         {
-            LogHelper.Info("UpdateScheme-请求开始:" + schemeInfoId + ";" + schemeId + "\n");
-            try
-            {
+         
+          
                 _wFSchemeInfo.UpdateScheme(schemeInfoId, schemeId, CurrentUser);
                 LogHelper.Info("UpdateScheme-请求结束:" + "操作成功" + "\n");
                 return Success("更新成功！");
-            }
-            catch (Exception e)
-            {
-                LogHelper.Error("UpdateScheme-请求异常:" + e.Message + "\n");
-                return Error("系统异常");
-            }
+      
         }
 
 

WorkFlowApi/WorkFlowApi/Filter/WebApiActionLogFilter.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.Http.Controllers;
+using System.Web.Http.Filters;
+using WorkFlowApi.Utility;
+
+namespace WorkFlowApi.Filter
+{
+    public class WebApiActionLogFilter: ActionFilterAttribute
+    {
+        private string  _IsDebugLog = ConfigHelper.GetValue("IsLog").ToString();
+        public override void OnActionExecuting(HttpActionContext actionContext)
+        {
+            if (_IsDebugLog=="1")
+            {
+                base.OnActionExecuting(actionContext);
+                HttpContextBase cnt = (HttpContextBase)actionContext.Request.Properties["MS_HttpContext"];//获取传统context
+                HttpRequestBase request = cnt.Request;//定义传统request对象  
+
+                string param = string.Empty;
+                if (request.QueryString != null && request.QueryString.Count > 0)
+                {
+                    param = request.QueryString.ToJson();
+                }
+
+                if (request.ContentLength > 0)
+                {
+                    using (var ms = new MemoryStream())
+                    {
+                        request.InputStream.CopyTo(ms);
+                        param = Encoding.UTF8.GetString(ms.ToArray());
+                        //上传文件时截取
+                        if (param.IndexOf("\r\n\r\n") > 0)
+                        {
+                            param = param.Substring(0, param.IndexOf("\r\n\r\n"));
+                        }
+                    }
+
+                    request.InputStream.Position = 0;
+                }
+
+                string usercode = cnt.User?.Identity.Name ?? "";
+                LogHelper.Info(usercode + ",进入执行，请求地址：" + request.Url.ToString() + "，参数：" + param);
+            }
+          
+        }
+
+        public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext)
+        {
+            if (_IsDebugLog == "1")
+            {
+                base.OnActionExecuted(actionExecutedContext);
+                HttpContextBase cnt = (HttpContextBase)actionExecutedContext.Request.Properties["MS_HttpContext"];//获取传统context
+                HttpRequestBase request = cnt.Request;//定义传统request对象  
+
+                string param = string.Empty;
+                if (request.QueryString != null && request.QueryString.Count > 0)
+                {
+                    param = request.QueryString.ToJson();
+                }
+
+                if (request.ContentLength > 0)
+                {
+                    using (var ms = new MemoryStream())
+                    {
+                        request.InputStream.CopyTo(ms);
+                        param = Encoding.UTF8.GetString(ms.ToArray());
+                        //上传文件时截取
+                        if (param.IndexOf("\r\n\r\n") > 0)
+                        {
+                            param = param.Substring(0, param.IndexOf("\r\n\r\n"));
+                        }
+                    }
+
+                    request.InputStream.Position = 0;
+                }
+
+                string usercode = cnt.User?.Identity.Name ?? "";
+                LogHelper.Info(usercode + ",退出执行，请求地址：" + request.Url.ToString() + "，返回结果：" + actionExecutedContext.Response.Content.ReadAsStringAsync().Result);
+            }
+               
+        }
+    }
+
+
+}

WorkFlowApi/WorkFlowApi/Web.config

@@ -25,7 +25,7 @@
     <httpProtocol>
       <customHeaders>
         <add name="Access-Control-Allow-Origin" value="*" />
-        <add name="Access-Control-Allow-Headers" value="*" />
+        <add name="Access-Control-Allow-Headers" value="authorization,Authorization,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type" />
         <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS" />
       </customHeaders>
     </httpProtocol>

WorkFlowApi/WorkFlowApi/WorkFlowApi.csproj

@@ -122,6 +122,7 @@
     <Compile Include="Controllers\WorkFlow\WFSchemeController.cs" />
     <Compile Include="Filter\AuthorizeFilter.cs" />
     <Compile Include="Filter\ExceptionFilter.cs" />
+    <Compile Include="Filter\WebApiActionLogFilter.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>