Merge branch 'master' of http://192.168.1.222:3000/duhongyu/Anyang_api

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Login/LoginController.cs

@@ -50,8 +50,8 @@ namespace CallCenterApi.Interface.Controllers
                     string pw = "";
                     try
                     {
-                        pw = otherController.Decrypt(login.Password.Trim (), st);
-                        
+                        pw = otherController.Decrypt(login.Password.Trim(), st);
+
                     }
                     catch (Exception e)
                     {
@@ -138,7 +138,7 @@ namespace CallCenterApi.Interface.Controllers
                             });
                             var token = FormsPrincipal<Dictionary<string, string>>.GetCookieValue(Dic["F_UserCode"], Dic);
                             var user = new BLL.T_Sys_UserAccount().GetModel(dt.Rows[0]["F_UserCode"].ToString());
-                             if (user!=null )
+                            if (user != null)
                             {
                                 user.F_LastActiveTime = DateTime.Now;
                                 new BLL.T_Sys_UserAccount().Update(user);
@@ -159,7 +159,14 @@ namespace CallCenterApi.Interface.Controllers
                         else
                         {
                             //写入登录日志
-                            DataTable dt1 = new CallCenterApi.BLL.T_Sys_UserAccount().GetList("F_UserCode='" + login.Username + "'").Tables[0];
+                            //DataTable dt1 = new CallCenterApi.BLL.T_Sys_UserAccount().GetList("F_UserCode='" + login.Username + "'").Tables[0];
+
+                            Dictionary<string, string> paras1 = new Dictionary<string, string>();
+                            int code = int.Parse(login.Username);
+                            string sql1 = " select * from T_Sys_UserAccount where F_UserCode=@F_UserCode ";
+                            paras1.Add("@F_UserCode", login.Username);
+
+                            var dt1 = DbHelperSQL.Query(sql1, paras1).Tables[0];
                             if (dt1.Rows.Count > 0)
                             {
                                 int rr = new CallCenterApi.BLL.T_Sys_LoginLogs().Add(new Model.T_Sys_LoginLogs()
@@ -210,7 +217,6 @@ namespace CallCenterApi.Interface.Controllers
             {
                 return Error("授权过期，请联系系统厂家。");
             }
-
         }
         public ActionResult GetAuAuthDate()
         {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Global.asax.cs

@@ -15,7 +15,7 @@ namespace CallCenterApi.Interface
 {
     public class MvcApplication : System.Web.HttpApplication
     {
-        private static QuartzWorker _worker;
+        //private static QuartzWorker _worker;
         protected void Application_Start()
         {
             AreaRegistration.RegisterAllAreas();
@@ -23,10 +23,10 @@ namespace CallCenterApi.Interface
             //clq 增加异常日志记录 自定义 HandleErrorAttribute
             FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
 
-            _worker = new QuartzWorker();
-            var callPlanWork = new CallPlanWork();
-            _worker.AddWork(callPlanWork);
-            _worker.Start();
+            //_worker = new QuartzWorker();
+            //var callPlanWork = new CallPlanWork();
+            //_worker.AddWork(callPlanWork);
+            //_worker.Start();
         }
 
         protected void Application_AuthenticateRequest(object sender, EventArgs e)