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

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

@@ -65,19 +65,20 @@ namespace CallCenterApi.Interface.Controllers
             };
             //序列化参数
             var jsonParam = JsonConvert.SerializeObject(dic);
-            //发送请求
-            var request = (HttpWebRequest)WebRequest.Create(Smsurl);
-            request.Method = "POST";
-            request.ContentType = "application/json;charset=UTF-8";
-            var byteData = Encoding.UTF8.GetBytes(jsonParam);
-            var length = byteData.Length;
-            request.ContentLength = length;
-            var writer = request.GetRequestStream();
-            writer.Write(byteData, 0, length);
-            writer.Close();
-            //接收数据
-            var response = (HttpWebResponse)request.GetResponse();
-            var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd();
+            ////发送请求
+            //var request = (HttpWebRequest)WebRequest.Create(Smsurl);
+            //request.Method = "POST";
+            //request.ContentType = "application/json;charset=UTF-8";
+            //var byteData = Encoding.UTF8.GetBytes(jsonParam);
+            //var length = byteData.Length;
+            //request.ContentLength = length;
+            //var writer = request.GetRequestStream();
+            //writer.Write(byteData, 0, length);
+            //writer.Close();
+            ////接收数据
+            //var response = (HttpWebResponse)request.GetResponse();
+            //var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd();
+            var responseString = HttpMethods.HttpPost(Smsurl, jsonParam, "application/json;charset=UTF-8");
             JObject jo = (JObject)JsonConvert.DeserializeObject(responseString );
             string access_token = jo["resultcode"].ToString();
             string taskid = jo["taskid"].ToString();
@@ -159,18 +160,20 @@ namespace CallCenterApi.Interface.Controllers
             //序列化参数
             var jsonParam = JsonConvert.SerializeObject(dic);
             //发送请求
-            var request = (HttpWebRequest)WebRequest.Create(Smsurl);
-            request.Method = "POST";
-            request.ContentType = "application/json;charset=UTF-8";
-            var byteData = Encoding.UTF8.GetBytes(jsonParam);
-            var length = byteData.Length;
-            request.ContentLength = length;
-            var writer = request.GetRequestStream();
-            writer.Write(byteData, 0, length);
-            writer.Close();
-            //接收数据
-            var response = (HttpWebResponse)request.GetResponse();
-            var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd();
+            //var request = (HttpWebRequest)WebRequest.Create(Smsurl);
+            //request.Method = "POST";
+            //request.ContentType = "application/json;charset=UTF-8";
+            //var byteData = Encoding.UTF8.GetBytes(jsonParam);
+            //var length = byteData.Length;
+            //request.ContentLength = length;
+            //var writer = request.GetRequestStream();
+            //writer.Write(byteData, 0, length);
+            //writer.Close();
+            ////接收数据
+            //var response = (HttpWebResponse)request.GetResponse();
+            //var responseString = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding("utf-8")).ReadToEnd();
+
+            var responseString = HttpMethods.HttpPost(Smsurl, jsonParam, "application/json;charset=UTF-8");
             JObject jo = (JObject)JsonConvert.DeserializeObject(responseString);
             string access_token = jo["resultcode"].ToString();
             string taskid = jo["taskid"].ToString();

CallCenterCommon/CallCenter.Utility/Http/HttpMethods.cs

@@ -19,7 +19,7 @@ namespace CallCenter.Utility
         /// <param name="url">URL.</param>
         /// <param name="param">POST的数据</param>
         /// <returns></returns>
-        public static string HttpPost(string url, string param = null)
+        public static string HttpPost(string url, string param = null, string contentType = "application/x-www-form-urlencoded")
         {
             HttpWebRequest request;
 
@@ -36,7 +36,7 @@ namespace CallCenter.Utility
             }
 
             request.Method = "POST";
-            request.ContentType = "application/x-www-form-urlencoded";
+            request.ContentType = contentType;
             request.Accept = "*/*";
             request.Timeout = 15000;
             request.AllowAutoRedirect = false;
@@ -61,9 +61,9 @@ namespace CallCenter.Utility
                     reader.Close();
                 }
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                throw;
+                LogFactory.GetLogger("HttpPost").Error(url + "\r\n" + param + "\r\n" + ex.ToString());
             }
             finally
             {