与服务器通信修改

source/Common/util/HttpHelper.cs

@@ -26,7 +26,7 @@ namespace OnlineStore.Common
             {
                 while ((DateTime.Now - startTime).TotalMinutes < 60)
                 {
-                    postRes = Post(url, paramData, Encoding.UTF8, out bool isTimeOut);
+                    postRes = PostJson(url, paramData, Encoding.UTF8, out bool isTimeOut);
                     ResponseData data = JsonHelper.DeserializeJsonToObject<ResponseData>(postRes);
 
                     if (data != null)
@@ -57,12 +57,8 @@ namespace OnlineStore.Common
             return postRes;
         }
 
-        public static string Post(string url, string paramData)
-        {
-            bool isTimeOut = false;
-            return Post(url, paramData, Encoding.UTF8, out isTimeOut);
-        }
-        public static Operation Post(string url, Operation operation, bool simulate=false)
+       
+        public static Operation PostJson(string url, Operation operation, bool simulate=false)
         {
             try
             { 
@@ -92,8 +88,9 @@ namespace OnlineStore.Common
                     catch (Exception ex)
                     {
                         LogUtil.error("JsonHelper.SerializeObject(operation) 出错【operation.op=" + operation.op + "】" + ex);
-                    } 
-                    string result = Post(url, json);
+                    }
+                    bool IsTimeOut = false;
+                    string result = PostJson(url, json,Encoding.UTF8,out IsTimeOut);
                     if (!string.IsNullOrEmpty(result))
                     {
                         try
@@ -115,17 +112,14 @@ namespace OnlineStore.Common
         }
         private static int isLog = ConfigAppSettings.GetIntValue(Setting_Init.Server_Log_Open);
         public static string LastServerMsg = "";
-        public static string Post(string url, string paramData, Encoding encoding, out bool isTimeOut)
-        { 
+        private static string PostJson(string url, string paramData, Encoding encoding, out bool isTimeOut)
+        {
             isTimeOut = false;
             if (isLog == 1)
             {
                 LogUtil.info("给服务器发送数据【" + paramData + "】 ");
             }
-            if (paramData != "null" && paramData != null)
-            {
-                //   LogUtil.debug(LOGGER,  "HTTP POST to " + url + " \n\t >> " + paramData);
-            }
+
             string result = "";
 
             if (url.ToLower().IndexOf("https", System.StringComparison.Ordinal) > -1)
@@ -142,7 +136,6 @@ namespace OnlineStore.Common
                 wc.Encoding = encoding;
 
                 result = wc.UploadString(url, "POST", paramData);
-                //LogUtil.info(result);
             }
             catch (WebException e)
             {
@@ -153,20 +146,70 @@ namespace OnlineStore.Common
             {
                 LogUtil.error("POST ERROR:" + ex.ToString(), 1);
             }
-
-            if (!result.Contains("null") && result.Length != 0)
-            {
-                //LogUtil.debug(LOGGER,"receive << " + result);
-            }
             if (isLog == 1)
             {
                 LogUtil.info("收到服务器数据【" + result + "】");
             }
             LastServerMsg = DateTime.Now.ToLongTimeString() + " URL：" + url + "\r\n"
               + "发送：" + paramData + "\r\n"
-                 + "接收：" + result + "\r\n"
+                 + "接收：" + result + "\r\n";
+            return result;
+        }
 
-                ;
+
+        public static string Post(string url, string paramData, int timeOut = 5000)
+        {
+            bool IsTimeOut = false;
+            return Post(url, paramData, Encoding.UTF8, timeOut, out IsTimeOut);
+        } 
+        public static string Post(string url, string paramData, Encoding encoding, int timeOut, out bool IsTimeOut)
+        {
+
+            if (paramData.Equals(""))
+            {
+                int index = url.IndexOf("?");
+                if (index > 0)
+                {
+                    paramData = url.Substring(index + 1, url.Length - index - 1);
+                    url = url.Substring(0, index);
+                }
+            }
+
+            IsTimeOut = false;
+            if (isLog == 1)
+            {
+                LogUtil.info("给服务器发送数据【" + url + "】【" + paramData + "】 ");
+            }
+            string result = "";
+
+            if (url.ToLower().IndexOf("https", System.StringComparison.Ordinal) > -1)
+            {
+                ServicePointManager.ServerCertificateValidationCallback =
+                               new RemoteCertificateValidationCallback((sender, certificate, chain, errors) => { return true; });
+            }
+
+            try
+            {
+                var wc = new MyWebClient(timeOut);
+                if (string.IsNullOrEmpty(wc.Headers["Content-Type"]))
+                    wc.Headers.Add("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
+                wc.Encoding = encoding; 
+                result = wc.UploadString(url, "POST", paramData); 
+            }
+            catch (WebException ex)
+            {
+                IsTimeOut = true;
+                LogUtil.error("POST [" + url + "] WebException :" + ex.ToString(), 101);
+            }
+            catch (Exception e)
+            {
+                LogUtil.error("POST [" + url + "] ERROR:" + e.ToString(), 101);
+            }
+           
+            if (isLog == 1)
+            {
+                LogUtil.info("收到服务器数据【" + result + "】");
+            }
             return result;
         }
 

source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs

@@ -581,7 +581,7 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.error(Name + "没有湿度预警范围，需要从服务器获取，发送OP=" + lineOperation.op, DeviceID + 105);
             }
             string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
-            Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), lineOperation, false);
+            Operation resultOperation = HttpHelper.PostJson(StoreManager.GetPostApi(server), lineOperation, false);
 
             //发送状态信息到服务器 
             if (resultOperation == null || (resultOperation.op <= 0))
@@ -732,7 +732,7 @@ namespace OnlineStore.DeviceLibrary
                 operation.op = 1;
                 operation.data = new Dictionary<string, string>() { { "code", message }, { "boxId", 1.ToString() }, { ParamDefine.rfid, CurrShelfID } };
                 string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
-                Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false);
+                Operation resultOperation = HttpHelper.PostJson(StoreManager.GetPostApi(server), operation, false);
                 if (resultOperation == null)
                 {
                     CodeMsg = "二维码【" + message + "】没有收到服务器反馈";
@@ -876,7 +876,7 @@ namespace OnlineStore.DeviceLibrary
                 operation.op = 1;
                 operation.data = new Dictionary<string, string>() { { "code", message }, { "boxId", 1.ToString() }, { ParamDefine.rfid, CurrShelfID } };
                 string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
-                Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false);
+                Operation resultOperation = HttpHelper.PostJson(StoreManager.GetPostApi(server), operation, false);
                 if (resultOperation == null)
                 {
                     CodeMsg = "二维码【" + message + "】没有收到服务器反馈";