|
|
@@ -16,7 +16,7 @@ namespace CallCenterApi.Interface.Controllers.Base
|
|
16
|
16
|
{
|
|
17
|
17
|
try
|
|
18
|
18
|
{
|
|
19
|
|
- var us= (FormsPrincipal<Model.T_Sys_UserAccount>)base.User;
|
|
|
19
|
+ var us = (FormsPrincipal<Model.T_Sys_UserAccount>)base.User;
|
|
20
|
20
|
|
|
21
|
21
|
return us.UserData;
|
|
22
|
22
|
}
|
|
|
@@ -31,7 +31,7 @@ namespace CallCenterApi.Interface.Controllers.Base
|
|
31
|
31
|
/// </summary>
|
|
32
|
32
|
public Log FileLog
|
|
33
|
33
|
{
|
|
34
|
|
- get { return LogFactory.GetLogger(this.GetType().ToString()+"/"+this.ControllerContext.RouteData.Values["Action"].ToString()); }
|
|
|
34
|
+ get { return LogFactory.GetLogger(this.GetType().ToString() + "/" + this.ControllerContext.RouteData.Values["Action"].ToString()); }
|
|
35
|
35
|
}
|
|
36
|
36
|
|
|
37
|
37
|
/// <summary>
|
|
|
@@ -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((User == null ? "" : User.F_UserCode) + message);
|
|
|
45
|
+ FileLog.Info((User?.F_UserCode ?? "") + message);
|
|
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((User == null ? "" : User.F_UserCode) + message);
|
|
|
58
|
+ FileLog.Info((User?.F_UserCode ?? "") + message);
|
|
59
|
59
|
return Content(jsonMsg);
|
|
60
|
60
|
}
|
|
61
|
61
|
|
|
|
@@ -78,7 +78,7 @@ 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((User == null ? "" : User.F_UserCode) + jsonMsg);
|
|
|
81
|
+ FileLog.Error((User?.F_UserCode ?? "") + jsonMsg);
|
|
82
|
82
|
return Content(jsonMsg);
|
|
83
|
83
|
}
|
|
84
|
84
|
|
|
|
@@ -90,7 +90,7 @@ namespace CallCenterApi.Interface.Controllers.Base
|
|
90
|
90
|
protected virtual ActionResult Warn(string message)
|
|
91
|
91
|
{
|
|
92
|
92
|
var jsonMsg = new AjaxResult { state = ResultTypes.warning.ToString(), message = message }.ToJson();
|
|
93
|
|
- FileLog.Warn((User == null ? "" : User.F_UserCode) + jsonMsg);
|
|
|
93
|
+ FileLog.Warn((User?.F_UserCode ?? "") + jsonMsg);
|
|
94
|
94
|
return Content(jsonMsg);
|
|
95
|
95
|
}
|
|
96
|
96
|
/// <summary>
|
|
|
@@ -101,7 +101,7 @@ namespace CallCenterApi.Interface.Controllers.Base
|
|
101
|
101
|
protected virtual ActionResult Warn(string message, object data)
|
|
102
|
102
|
{
|
|
103
|
103
|
var jsonMsg = new AjaxResult { state = ResultTypes.warning.ToString(), message = message, data = data }.ToJson();
|
|
104
|
|
- FileLog.Warn(jsonMsg);
|
|
|
104
|
+ FileLog.Warn((User?.F_UserCode ?? "") + jsonMsg);
|
|
105
|
105
|
return Content(jsonMsg);
|
|
106
|
106
|
}
|
|
107
|
107
|
|
|
|
@@ -114,7 +114,7 @@ namespace CallCenterApi.Interface.Controllers.Base
|
|
114
|
114
|
protected virtual ActionResult NoToken(string message)
|
|
115
|
115
|
{
|
|
116
|
116
|
var jsonMsg = new AjaxResult { state = ResultTypes.notoken.ToString(), message = message }.ToJson();
|
|
117
|
|
- FileLog.Info((User == null ? "" : User.F_UserCode) + jsonMsg);
|
|
|
117
|
+ FileLog.Info((User?.F_UserCode ?? "") + jsonMsg);
|
|
118
|
118
|
return Content(jsonMsg);
|
|
119
|
119
|
}
|
|
120
|
120
|
|
|
|
@@ -126,10 +126,8 @@ namespace CallCenterApi.Interface.Controllers.Base
|
|
126
|
126
|
protected virtual ActionResult UnAuthorized(string message)
|
|
127
|
127
|
{
|
|
128
|
128
|
var jsonMsg = new AjaxResult { state = ResultTypes.unauthorized.ToString(), message = message }.ToJson();
|
|
129
|
|
- FileLog.Error((User == null ? "" : User.F_UserCode) + jsonMsg);
|
|
|
129
|
+ FileLog.Error((User?.F_UserCode ?? "") + jsonMsg);
|
|
130
|
130
|
return Content(jsonMsg);
|
|
131
|
131
|
}
|
|
132
|
|
-
|
|
133
|
|
-
|
|
134
|
132
|
}
|
|
135
|
133
|
}
|