Просмотр исходного кода

Merge branch 'master' of http://192.168.1.222:3000/zhangkun/ditie2.0_web

miaofuhao лет назад: 4
Родитель
Сommit
4733ea2fd4
1 измененных файлов с 7 добавлено и 2 удалено
  1. 7 2
      web/YTSoft.BaseCallCenter.MVCWeb/Controllers/BaseController.cs

+ 7 - 2
web/YTSoft.BaseCallCenter.MVCWeb/Controllers/BaseController.cs

19
         BLL.T_Sys_SystemConfig bll_T_Sys_SystemConfig = new BLL.T_Sys_SystemConfig();
19
         BLL.T_Sys_SystemConfig bll_T_Sys_SystemConfig = new BLL.T_Sys_SystemConfig();
20
         BLL.T_Com_LogAction busLog = new BLL.T_Com_LogAction();
20
         BLL.T_Com_LogAction busLog = new BLL.T_Com_LogAction();
21
 
21
 
22
+        /// <summary>
23
+        /// 时间转换
24
+        /// </summary>
25
+        private JsonSerializerSettings timeConvert = new JsonSerializerSettings() { DateFormatString = "yyyy'-'MM'-'dd' 'HH':'mm':'ss" };
26
+
22
 
27
 
23
         #region 登录用户信息
28
         #region 登录用户信息
24
 
29
 
394
         {
399
         {
395
             var jsonMsg = new ReturnData { code =0, msg = message, data = data ,count= count };
400
             var jsonMsg = new ReturnData { code =0, msg = message, data = data ,count= count };
396
             // LogDefault.Info(jsonMsg);
401
             // LogDefault.Info(jsonMsg);
397
-            return JsonConvert.SerializeObject(jsonMsg);
402
+            return JsonConvert.SerializeObject(jsonMsg, timeConvert);
398
         }
403
         }
399
 
404
 
400
         /// <summary>
405
         /// <summary>
407
         {
412
         {
408
             var jsonMsg = new ReturnData { code = 0, msg = message };
413
             var jsonMsg = new ReturnData { code = 0, msg = message };
409
             // LogDefault.Info(jsonMsg);
414
             // LogDefault.Info(jsonMsg);
410
-            return JsonConvert.SerializeObject(jsonMsg);
415
+            return JsonConvert.SerializeObject(jsonMsg, timeConvert);
411
         }
416
         }
412
 
417
 
413
         /// <summary>
418
         /// <summary>