zhoufan 4 年 前
コミット
4dabc12a90

+ 24 - 6
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Base/BaseController.cs

@@ -10,7 +10,7 @@ namespace CallCenterApi.Interface.Controllers.Base
10 10
 {
11 11
     public class BaseController : Controller
12 12
     {
13
-        public new Model.T_Sys_UserAccount CurrentUser
13
+        public Model.T_Sys_UserAccount CurrentUser
14 14
         {
15 15
             get
16 16
             {
@@ -42,7 +42,7 @@ namespace CallCenterApi.Interface.Controllers.Base
42 42
         protected virtual ActionResult Success(string message)
43 43
         {
44 44
             var jsonMsg = new AjaxResult { state = ResultTypes.success.ToString(), message = message }.ToJson();
45
-            FileLog.Info(jsonMsg);
45
+            FileLog.Info((CurrentUser?.F_UserCode ?? "") + "|" + jsonMsg);
46 46
             return Content(jsonMsg);
47 47
         }
48 48
 
@@ -55,7 +55,7 @@ namespace CallCenterApi.Interface.Controllers.Base
55 55
         protected virtual ActionResult Success(string message, object data)
56 56
         {
57 57
             var jsonMsg = new AjaxResult { state = ResultTypes.success.ToString(), message = message,data=data }.ToJson();
58
-            FileLog.Info(jsonMsg);
58
+            FileLog.Info((CurrentUser?.F_UserCode ?? "") + "|" + jsonMsg);
59 59
             return Content(jsonMsg);
60 60
         }
61 61
 
@@ -78,7 +78,25 @@ namespace CallCenterApi.Interface.Controllers.Base
78 78
         protected virtual ActionResult Error(string message)
79 79
         {
80 80
             var jsonMsg = new AjaxResult { state = ResultTypes.error.ToString(), message = message }.ToJson();
81
-            FileLog.Error(jsonMsg);
81
+            //FileLog.Error((CurrentUser?.F_UserCode ?? "") + "|" + jsonMsg);
82
+
83
+            Dictionary<string, string> Params = new Dictionary<string, string>();
84
+            Params.Add("request_url", Request.Url.ToString());
85
+
86
+            if (Request.HttpMethod.ToUpper() != "GET")
87
+            {
88
+                foreach (var key in Request.Params.AllKeys)
89
+                {
90
+                    if (key == "ALL_HTTP")
91
+                    {
92
+                        break;
93
+                    }
94
+                    Params.Add(key, Request.Params[key]);
95
+                }
96
+            }
97
+
98
+            FileLog.Error((CurrentUser?.F_UserCode ?? "") + "|" + Params.ToJson() + "|" + jsonMsg);
99
+
82 100
             return Content(jsonMsg);
83 101
         }
84 102
 
@@ -90,7 +108,7 @@ namespace CallCenterApi.Interface.Controllers.Base
90 108
         protected virtual ActionResult NoToken(string message)
91 109
         {
92 110
             var jsonMsg = new AjaxResult { state = ResultTypes.notoken.ToString(), message = message }.ToJson();
93
-            FileLog.Info(jsonMsg);
111
+            FileLog.Info((CurrentUser?.F_UserCode ?? "") + "|" + jsonMsg);
94 112
             return Content(jsonMsg);
95 113
         }
96 114
 
@@ -102,7 +120,7 @@ namespace CallCenterApi.Interface.Controllers.Base
102 120
         protected virtual ActionResult UnAuthorized(string message)
103 121
         {
104 122
             var jsonMsg = new AjaxResult { state = ResultTypes.unauthorized.ToString(), message = message }.ToJson();
105
-            FileLog.Error(jsonMsg);
123
+            FileLog.Error((CurrentUser?.F_UserCode ?? "") + "|" + jsonMsg);
106 124
             return Content(jsonMsg);
107 125
         }
108 126
 

+ 22 - 18
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Login/LoginController.cs

@@ -100,31 +100,35 @@ namespace CallCenterApi.Interface.Controllers
100 100
             }
101 101
         }
102 102
 
103
-        public ActionResult Logout(string token = "")
103
+        /// <summary>
104
+        /// 推出
105
+        /// </summary>
106
+        /// <returns></returns>
107
+        [Authority]
108
+        public ActionResult Logout()
104 109
         {
105 110
             int userId = CurrentUser.F_UserId;
106 111
             string userName = CurrentUser.F_UserName;
107
-            
112
+
113
+            //写入登录日志
114
+            new CallCenterApi.BLL.T_Sys_LoginLogs().Add(new Model.T_Sys_LoginLogs()
108 115
             {
109
-                //写入登录日志
110
-                new CallCenterApi.BLL.T_Sys_LoginLogs().Add(new Model.T_Sys_LoginLogs()
111
-                {
112
-                    F_LoginName = userName,
113
-                    F_LoginId = userId,
114
-                    F_Result = "退出成功",
115
-                    F_LoginIP = Common.DTRequest.GetIP(),
116
-                    F_Hostname = Common.DTRequest.GetIP(),
117
-                    F_LoginOutDate = DateTime.Now,
118
-                    F_Remark = "",
119
-                    F_State = 0
120
-                });
121
-                //CacheHelper.Remove(token);
122
-
123
-                //RedisHelper.KeyDelete(CommonHelper.MD5(token));
124
-            }
116
+                F_LoginName = userName,
117
+                F_LoginId = userId,
118
+                F_Result = "退出成功",
119
+                F_LoginIP = Common.DTRequest.GetIP(),
120
+                F_Hostname = Common.DTRequest.GetIP(),
121
+                F_LoginOutDate = DateTime.Now,
122
+                F_Remark = "",
123
+                F_State = 0
124
+            });
125
+            //CacheHelper.Remove(token);
126
+
127
+            //RedisHelper.KeyDelete(CommonHelper.MD5(token));
125 128
             return Success("退出成功");
126 129
         }
127 130
 
131
+        [Authority]
128 132
         public ActionResult Authority(string token = "", string url = "")
129 133
         {
130 134
             var roleId = CurrentUser.F_RoleId;