Merge branch '合金库' of http://120.77.11.229:3000/zuolinhao/WcsFramework into 合金库

ServiceCenter/Extensions/TypeExtension.cs

@@ -312,16 +312,16 @@ namespace ServiceCenter.Extensions
                     return time.ToString("yyyy-MM-dd");
 
                 case GetFormatterEnum.yyyyMMddhh:
-                    return time.ToString("yyyy-MM-dd hh");
+                    return time.ToString("yyyy-MM-dd HH");
 
                 case GetFormatterEnum.yyyyMMddhhmm:
-                    return time.ToString("yyyy-MM-dd hh:mm");
+                    return time.ToString("yyyy-MM-dd HH:mm");
 
                 case GetFormatterEnum.yyyyMMddhhmmss:
-                    return time.ToString("yyyy-MM-dd hh:mm:ss");
+                    return time.ToString("yyyy-MM-dd HH:mm:ss");
 
                 case GetFormatterEnum.yyyyMMddhhmmssfffffff:
-                    return time.ToString("yyyy-MM-dd hh:mm:ss:fffffff");
+                    return time.ToString("yyyy-MM-dd HH:mm:ss:fffffff");
 
                 default:
                     return time.ToString();

ServiceCenter/WebApi/APICaller.cs

@@ -83,25 +83,33 @@ namespace ServiceCenter.WebApi
         {
             var name = url.Split("/").Last();
             LogHub.InterfacePublish(name, $"{DateTime.Now.yyyyMMddhhmmssf()}--[{Thread.CurrentThread.ManagedThreadId}]--接口{name}传参---------{JsonConvert.SerializeObject(jsonstr)}");
-            var sw = new Stopwatch();
-            sw.Start();
-            Encoding encoding = Encoding.UTF8;
-            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);//webrequest请求api地址
-            request.Timeout = 60000;//连接超时
-            request.ReadWriteTimeout = 3600000;//读写超时
-            request.Accept = "text/html,application/xhtml+xml,*/*";
-            request.ContentType = "application/json";
-            request.Method = type.ToUpper().ToString();//get或者post
-            byte[] buffer = encoding.GetBytes(jsonstr);
-            request.ContentLength = buffer.Length;
-            request.GetRequestStream().Write(buffer, 0, buffer.Length);
-            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
-            using (StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8))
+            try
             {
-                var res = reader.ReadToEnd();
-                sw.Stop();
-                LogHub.InterfacePublish(name, $"{DateTime.Now.yyyyMMddhhmmssf()}--[{Thread.CurrentThread.ManagedThreadId}]--接口{name}调用耗时:{sw.ElapsedMilliseconds}---------{JsonConvert.SerializeObject(res)}");
-                return res;
+                var sw = new Stopwatch();
+                sw.Start();
+                Encoding encoding = Encoding.UTF8;
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);//webrequest请求api地址
+                request.Timeout = 60000;//连接超时
+                request.ReadWriteTimeout = 3600000;//读写超时
+                request.Accept = "text/html,application/xhtml+xml,*/*";
+                request.ContentType = "application/json";
+                request.Method = type.ToUpper().ToString();//get或者post
+                byte[] buffer = encoding.GetBytes(jsonstr);
+                request.ContentLength = buffer.Length;
+                request.GetRequestStream().Write(buffer, 0, buffer.Length);
+                HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+                using (StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8))
+                {
+                    var res = reader.ReadToEnd();
+                    sw.Stop();
+                    LogHub.InterfacePublish(name, $"{DateTime.Now.yyyyMMddhhmmssf()}--[{Thread.CurrentThread.ManagedThreadId}]--接口{name}调用耗时:{sw.ElapsedMilliseconds}---------{JsonConvert.SerializeObject(res)}");
+                    return res;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHub.InterfacePublish(name, $"{DateTime.Now.yyyyMMddhhmmssf()}--[{Thread.CurrentThread.ManagedThreadId}]--接口{name}调用错误:{ex.StackTrace}");
+                throw new Exception(ex.Message);
             }
         }
     }