From a70dac4349c9bb78d7be5052f371136d840b2665 Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期四, 22 四月 2021 15:42:42 +0800
Subject: [PATCH] 2021-04-22 临时备份

---
 HDL_ON/DAL/Server/HttpUtil.cs |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index e60ff0f..26b8a35 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -153,13 +153,17 @@
                 {
                     urlHead = OnAppConfig.Instance.RequestHttpsHost;
                 }
+<<<<<<< Updated upstream
                 //"https://bahrain-gateway.hdlcontrol.com";
                  urlHead="https://china-gateway.hdlcontrol.com";
                 string requestFullUrl = urlHead + apiPath;
+=======
+                //string requestFullUrl = urlHead + apiPath;
+>>>>>>> Stashed changes
 
 
                 ////**************娴嬭瘯**************
-                //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
+                string requestFullUrl = GlobalRequestHttpsHost + apiPath;
                 ////**************娴嬭瘯**************
 
                 RestClient client = new RestClient(requestFullUrl);
@@ -279,7 +283,7 @@
 
 
         /// <summary>
-        /// 鍒锋柊Token
+        /// 鍒锋柊  Token
         /// </summary>
         /// <returns></returns>
         static bool RefreshToken()

--
Gitblit v1.8.0