diff --git a/CRICS_V3_1124.suo b/CRICS_V3_1124.suo
index a13dd33..923ba7d 100644
Binary files a/CRICS_V3_1124.suo and b/CRICS_V3_1124.suo differ
diff --git a/Common/CSRedisCacheHelper.cs b/Common/CSRedisCacheHelper.cs
index e411593..aa110c9 100644
--- a/Common/CSRedisCacheHelper.cs
+++ b/Common/CSRedisCacheHelper.cs
@@ -20,6 +20,7 @@ namespace Common
         public static CSRedisClient redis3;
         public static CSRedisClient redis4;
         public static CSRedisClient redis5;
+        public static CSRedisClient redis_webchat;
         //private static readonly string[] redisHosts = null;
         private static int SessionExpireMinutes = int.Parse(ConfigurationManager.AppSettings["session_expire_minutes"]);
         private static int MonitorLogExpireMinutes = int.Parse(ConfigurationManager.AppSettings["monitor_log_expire_minutes"]);
@@ -40,6 +41,8 @@ namespace Common
         static CSRedisCacheHelper()
         {
             var redisHostStr = ConfigurationManager.AppSettings["redis_server_session"];
+            var webchat_redisstr = ConfigurationManager.AppSettings["webchat_redisstr"];
+            var webchat_redis_pwd = ConfigurationManager.AppSettings["webchat_redis_pwd"];
             if (!string.IsNullOrEmpty(redisHostStr))
             {
                 redis = new CSRedisClient(redisHostStr);//+ ",password=,defaultDatabase=0,poolsize=500,ssl=false,writeBuffer=10240,prefix=");
@@ -54,6 +57,8 @@ namespace Common
 
                 redis4 = new CSRedisClient(redisHostStr + ",password=,defaultDatabase=4");
                 redis5 = new CSRedisClient(redisHostStr + ",password=,defaultDatabase=5");
+                redis5 = new CSRedisClient(redisHostStr + ",password=,defaultDatabase=5");
+                redis_webchat = new CSRedisClient(string.Format(webchat_redisstr + ",password={0},defaultDatabase=0",webchat_redis_pwd));
 
                 //Native subscribe
                 string channel = "__keyevent@0__:expired";
diff --git a/CommonEntity/CacheKey.cs b/CommonEntity/CacheKey.cs
index 02fc64c..18443fe 100644
--- a/CommonEntity/CacheKey.cs
+++ b/CommonEntity/CacheKey.cs
@@ -120,6 +120,8 @@ namespace CommonEntity
         public static string FCSRoom_Mapping_Order = "FCS_R_M_O";
 
         public static string KongTiaoAlert = "KT#Alert";
+
+        public static string WebChatDeviceFault = "WXFault";
     }
     public class ChangLiangValue
     {
diff --git a/Domain/SysHotel.cs b/Domain/SysHotel.cs
index fc547f7..153157f 100644
--- a/Domain/SysHotel.cs
+++ b/Domain/SysHotel.cs
@@ -183,6 +183,15 @@ namespace Domain
             get;
             set;
         }
+
+        /// <summary>
+        /// 背景音乐
+        /// </summary>
+        public virtual string WelcomeBGM
+        {
+            get;
+            set;
+        }
         /// <summary>
         /// 离房提示：拔卡结束提示语
         /// </summary>
diff --git a/Domain/SysHotel.hbm.xml b/Domain/SysHotel.hbm.xml
index 3bec7e0..8c4f94a 100644
--- a/Domain/SysHotel.hbm.xml
+++ b/Domain/SysHotel.hbm.xml
@@ -25,6 +25,7 @@
     <property name="AssociatedAccount" column="AssociatedAccount" type="string"  />
     <property name="IsAutoGetKey" column="IsAutoGetKey" type="bool" />
     <property name="WelcomeSpeech" column="WelcomeSpeech" type="string"  />
+    <property name="WelcomeBGM" column="WelcomeBGM" type="string"  />
     <property name="GoodbyeSpeech" column="GoodbyeSpeech" type="string"  />
     <property name="DomainUrl" column="DomainUrl" type="string"  />
     <property name="ValidateDate" column="ValidateDate" type="DateTime"  />
diff --git a/RCUHost/Implement/HostServer.cs b/RCUHost/Implement/HostServer.cs
index 2de05c7..d7c67f3 100644
--- a/RCUHost/Implement/HostServer.cs
+++ b/RCUHost/Implement/HostServer.cs
@@ -887,6 +887,7 @@ namespace RCUHost.Implement
 
                         //欢迎词
                         string WelcomeSpeech = host.SysHotel.WelcomeSpeech;
+                        string WelcomeBGM = host.SysHotel.WelcomeBGM;
 
                         //欢送词
                         string GoodbyeSpeech = host.SysHotel.GoodbyeSpeech;
@@ -1023,21 +1024,31 @@ namespace RCUHost.Implement
                             #region 天猫
                             if (flag == 1 && !string.IsNullOrEmpty(WelcomeSpeech))//取电打开时，播放欢迎词
                             {
-                                var TTT = new Tuple<string, string, string, string>(TianMaoCUID, WelcomeSpeech, hotelcode, roomnumber);
+                                var TTT = new Tuple<string, string, string, string, string>(TianMaoCUID, WelcomeSpeech, hotelcode, roomnumber, WelcomeBGM);
 
                                 Task.Factory.StartNew((state) =>
                                 {
-                                    var hhh = state as Tuple<string, string, string, string>;
+                                    var hhh = state as Tuple<string, string, string, string, string>;
                                     var a = hhh.Item1.Split(',');
 
                                     var b = hhh.Item2;
                                     var c = hhh.Item3;
                                     var d = hhh.Item4;
+                                    var e = hhh.Item5;
 
                                     foreach (string cuid in a)//多个英文逗号隔开
                                     {
-                                        TianMaoOperation.PostWebRequestToTianMao("PushWelcome",
-                                            Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b }), c, d);//通知天猫精灵播放欢迎词
+                                        if (!string.IsNullOrEmpty(e))
+                                        {
+                                            string ffg = "https://www.boonlive-rcu.com/welcomebgm/" + e;
+                                            TianMaoOperation.PostWebRequestToTianMao("PushWelcome",
+                                                Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b, MusicUrl = ffg }), c, d);//通知天猫精灵播放欢迎词
+                                        }
+                                        else
+                                        {
+                                            TianMaoOperation.PostWebRequestToTianMao("PushWelcome",
+                                                Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b }), c, d);//通知天猫精灵播放欢迎词
+                                        }
 
                                         Interface3Log w1 = new Interface3Log();
                                         w1.HotelCode = c;
@@ -1395,7 +1406,7 @@ namespace RCUHost.Implement
                                                 //sb.Clear();
                                                 //sb.Append(VVV1);
                                                 //sb.Append(VVV2);
-                                                string sb = string.Concat(VVV1,VVV2);
+                                                string sb = string.Concat(VVV1, VVV2);
                                                 string YiJingChuLiGuo = CacheKey.AllReadyDealWith0E_Prefix + "_" + HostNUMBER;
                                                 object data = MemoryCacheHelper.Get(YiJingChuLiGuo);
                                                 if (data != null)
diff --git a/RCUHost/Implement/RoomStatusReceiver.cs b/RCUHost/Implement/RoomStatusReceiver.cs
index 9f0aebe..8c3c06a 100644
--- a/RCUHost/Implement/RoomStatusReceiver.cs
+++ b/RCUHost/Implement/RoomStatusReceiver.cs
@@ -967,13 +967,26 @@ namespace RCUHost.Implement
                                                                 var a = hhh.TianMaoCUID.Split(',');
 
                                                                 var b = hhh.SysHotel.WelcomeSpeech;
+                                                                string bb = hhh.SysHotel.WelcomeBGM;
+                                                                if (!string.IsNullOrEmpty(bb))
+                                                                {
+                                                                    bb = "https://www.boonlive-rcu.com/welcomebgm/" + bb;
+                                                                }
                                                                 var c = hhh.SysHotel.Code;
                                                                 var d = hhh.RoomNumber;
 
                                                                 foreach (string cuid in a)//多个英文逗号隔开
                                                                 {
-                                                                    TianMaoOperation.PostWebRequestToTianMao("PushWelcome",
-                                                                        Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b }), c, d);//通知天猫精灵播放欢迎词
+                                                                    if (!string.IsNullOrEmpty(bb))
+                                                                    {
+                                                                        TianMaoOperation.PostWebRequestToTianMao("PushWelcome",
+                                                                            Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b, MusicUrl = bb }), c, d);//通知天猫精灵播放欢迎词
+                                                                    }
+                                                                    else
+                                                                    {
+                                                                        TianMaoOperation.PostWebRequestToTianMao("PushWelcome",
+                                                                            Newtonsoft.Json.JsonConvert.SerializeObject(new { HotelId = cuid.Split('&')[0], RoomNo = cuid.Split('&')[1], WelcomeText = b }), c, d);//通知天猫精灵播放欢迎词
+                                                                    }
 
                                                                     Interface3Log w1 = new Interface3Log();
                                                                     w1.HotelCode = c;
diff --git a/WebSite/Controllers/RoomStatusController.cs b/WebSite/Controllers/RoomStatusController.cs
index 0f67d94..fadb139 100644
--- a/WebSite/Controllers/RoomStatusController.cs
+++ b/WebSite/Controllers/RoomStatusController.cs
@@ -374,7 +374,7 @@ namespace WebSite.Controllers
                         {
                             string DKey = string.Format("DKey_{0}_{1}_{2}_{3}", CurrentHotelID, roomnum, "054000001", "054000100");
                             var ddd = HttpContext.Cache.Get(DKey);
-                            List<SomeDeviceExistsData> takeOutdata = null;
+                            List<SomeDeviceExistsData> takeOutdata = new List<SomeDeviceExistsData>();
                             if (ddd != null)
                             {
                                 takeOutdata = ddd as List<SomeDeviceExistsData>;
diff --git a/WebSite/Controllers/SysHotelController.cs b/WebSite/Controllers/SysHotelController.cs
index f536ea3..e346e87 100644
--- a/WebSite/Controllers/SysHotelController.cs
+++ b/WebSite/Controllers/SysHotelController.cs
@@ -171,6 +171,67 @@ namespace WebSite.Controllers
             SaveSystemLog(AuthorityID, action, entity.Name);
             return Json(new { IsSuccess = true, Message = HttpContext.InnerLanguage("SaveSuccess") });
         }
+
+        /// <summary>
+        /// 上传BGM
+        /// </summary>
+        /// <returns></returns>
+        [Authorize()]
+        public ActionResult UploadWebcomeBGM()
+        {
+            try
+            {
+                var sysHotel = SysHotelManager.Get(CurrentHotelID);
+
+                HttpFileCollection hfc = System.Web.HttpContext.Current.Request.Files;
+
+                if (hfc.Count < 1 || hfc[0].ContentLength <= 0 || String.IsNullOrEmpty(hfc[0].FileName))
+                {
+                    return Json(new { IsSuccess = false, Message = HttpContext.InnerLanguage("PleaseSelectAuthorizationFile") });
+                }
+                string start_timeddd = DateTime.Now.ToString("yyyyMMddHHmmss");
+                string NewFileName = start_timeddd + hfc[0].FileName;
+                string file = string.Format(Tools.GetApplicationPath() + @"welcomebgm\{0}", NewFileName);
+                string path = Path.GetDirectoryName(file);
+                if (!Directory.Exists(path))
+                {
+                    Directory.CreateDirectory(path);
+                }
+
+                hfc[0].SaveAs(file);
+
+                var LLL = HostManager.LoadAll(CurrentHotelID);
+                foreach (Host item in LLL)
+                {
+                    Host TakeOut = null;
+                    string HostNumberOnly = item.HostNumber;
+                    string Key = CacheKey.HostInfo_Key_HostNumber + "_" + HostNumberOnly;
+                    object obj = MemoryCacheHelper.Get(Key);
+                    if (obj != null)
+                    {
+                        TakeOut = obj as Host;
+                        TakeOut.SysHotel.WelcomeBGM = NewFileName;
+                    }
+                }
+
+                sysHotel.WelcomeBGM = NewFileName;
+                SysHotelManager.Update(sysHotel);
+                return Json(new { IsSuccess = true, FileName = NewFileName }, JsonRequestBehavior.AllowGet);
+            }
+            catch (Exception ex)
+            {
+                if (logger.IsErrorEnabled)
+                {
+                    logger.Error(ex);
+                }
+
+                return Json(new { IsSuccess = false, Message = ex.Message }, JsonRequestBehavior.AllowGet);
+            }
+
+        }
+
+
+
         /// <summary>
         /// 保存第三方对接信息
         /// </summary>
@@ -499,7 +560,7 @@ namespace WebSite.Controllers
                     var T = JsonConvert.DeserializeObject<List<LingChenECO>>(reqData);
                     //T.ForEach(A => A.HotelCode = CurrentHotelCode);
                     string GGG = CacheKey.KT_Timer_Controller + "_" + CurrentHotelCode;
-                    CSRedisCacheHelper.Set_PartitionWithForever<List<LingChenECO>>(GGG,T,5);
+                    CSRedisCacheHelper.Set_PartitionWithForever<List<LingChenECO>>(GGG, T, 5);
                     var client1 = new RestClient(missionsys_address);
                     foreach (var item in T)
                     {
diff --git a/WebSite/License/blw-t3s.lic b/WebSite/License/blw-t3s.lic
index 5927002..3a5c14e 100644
--- a/WebSite/License/blw-t3s.lic
+++ b/WebSite/License/blw-t3s.lic
@@ -1 +1 @@
-HP6vcqAL58UjczRRQ7SpqppM9wczrgOic0weey1QcnOwxYcvTnrjb2iqkBsCPfbOxOYezdzkDroujE752nqi5UkychJq0szAj70/q3C0tG5fzXspn9ih9W67FbPxy50NTFAQd97KmH9k0bLIUdgv8rG3zicIc8yKZBkungptRjF8u7TWygG7BU/TuQqWd7xnzwjgIiqu/38AwpbY22XWlTLlsR89SrM682uO41AKBP2NqlUv16f/sfXpsLhJ9wec0dPGjspdpmpbWYIHhETbSzjiBIBI6+ik6fI563PT9HuwSloHJcH7eUan+SBArY4Nr7B+I/mRP+bdSTqBW9OuJgRPtxqDUkfngqkwORHmsA4GNBNDavZAQQ==
+HP6vcqAL58UjczRRQ7SpqppM9wczrgOic0weey1QcnOwxYcvTnrjb2iqkBsCPfbOxOYezdzkDroujE752nqi5al/ZAfZmClht3PdyuLcoBy09L1PXHp8fnfXgbAEhvN+VrclVv2W1CCOwhuobej6tFAf4WUYOQf8xJNTJvpm71IXNzGeairfhWwbWVsfXq+9qMrJYNiAEkUaCACHP7jNWxyOjnUv5p1hdcoVfjGmAJdgGhzl3KUwGpuTDQ9s4QqYWF9sN+lae8Xd7E9ueRF0A/eTr2ksTqdqdCIr2TYOxPL+oG+TmYhorTEVuA6DKJSiMGGTSvUILfwjUka9Zva88HB7MxbhqUB3zlYu+uut/vNVjNdSBveYow==
diff --git a/WebSite/Resource/en-US.Designer.cs b/WebSite/Resource/en-US.Designer.cs
index 929ad18..0d42286 100644
--- a/WebSite/Resource/en-US.Designer.cs
+++ b/WebSite/Resource/en-US.Designer.cs
@@ -8125,6 +8125,15 @@ namespace WebSite.Resource {
             }
         }
         
+        /// <summary>
+        ///   查找类似 WelcomeBGM 的本地化字符串。
+        /// </summary>
+        internal static string WelcomeBGM {
+            get {
+                return ResourceManager.GetString("WelcomeBGM", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Time of Welcome Mode（M） 的本地化字符串。
         /// </summary>
diff --git a/WebSite/Resource/en-US.resx b/WebSite/Resource/en-US.resx
index 89a0352..97a47ad 100644
--- a/WebSite/Resource/en-US.resx
+++ b/WebSite/Resource/en-US.resx
@@ -2896,4 +2896,7 @@ Single circuit status</value>
   <data name="TimerECO" xml:space="preserve">
     <value>Timed ECO</value>
   </data>
+  <data name="WelcomeBGM" xml:space="preserve">
+    <value>WelcomeBGM</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebSite/Resource/zh-CN.Designer.cs b/WebSite/Resource/zh-CN.Designer.cs
index 7980e4d..75e96e9 100644
--- a/WebSite/Resource/zh-CN.Designer.cs
+++ b/WebSite/Resource/zh-CN.Designer.cs
@@ -8133,6 +8133,15 @@ namespace WebSite.Resource {
             }
         }
         
+        /// <summary>
+        ///   查找类似 欢迎背景乐 的本地化字符串。
+        /// </summary>
+        internal static string WelcomeBGM {
+            get {
+                return ResourceManager.GetString("WelcomeBGM", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 欢迎模式时间(分) 的本地化字符串。
         /// </summary>
diff --git a/WebSite/Resource/zh-CN.resx b/WebSite/Resource/zh-CN.resx
index 075431b..c19a4b0 100644
--- a/WebSite/Resource/zh-CN.resx
+++ b/WebSite/Resource/zh-CN.resx
@@ -2898,4 +2898,7 @@
   <data name="TimerECO" xml:space="preserve">
     <value>定时调温</value>
   </data>
+  <data name="WelcomeBGM" xml:space="preserve">
+    <value>欢迎背景乐</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebSite/Resource/zh-TW.Designer.cs b/WebSite/Resource/zh-TW.Designer.cs
index 3d5019a..91a72cd 100644
--- a/WebSite/Resource/zh-TW.Designer.cs
+++ b/WebSite/Resource/zh-TW.Designer.cs
@@ -8135,6 +8135,15 @@ namespace WebSite.Resource {
             }
         }
         
+        /// <summary>
+        ///   查找类似 歡迎詞背景樂 的本地化字符串。
+        /// </summary>
+        internal static string WelcomeBGM {
+            get {
+                return ResourceManager.GetString("WelcomeBGM", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 歡迎模式時間(分) 的本地化字符串。
         /// </summary>
diff --git a/WebSite/Resource/zh-TW.resx b/WebSite/Resource/zh-TW.resx
index 0585757..e7748c0 100644
--- a/WebSite/Resource/zh-TW.resx
+++ b/WebSite/Resource/zh-TW.resx
@@ -2900,4 +2900,7 @@
   <data name="TimerECO" xml:space="preserve">
     <value>定時調溫</value>
   </data>
+  <data name="WelcomeBGM" xml:space="preserve">
+    <value>歡迎詞背景樂</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebSite/Scripts/host-index.js b/WebSite/Scripts/host-index.js
index 13dd625..3a6627d 100644
--- a/WebSite/Scripts/host-index.js
+++ b/WebSite/Scripts/host-index.js
@@ -712,6 +712,28 @@ function dockingInfo() {
 			.dialog({ title: lang.DockingInformation, width: 600, height: 380 })
 			.dialog("open");
 }
+
+function uploadmusic()
+{
+    var filename = $("#welcomebgm").val();
+    if (filename == "") {
+        return;
+    }
+    $.ajaxFileUpload({
+        url: "/SysHotel/UploadWebcomeBGM/",
+        type: "POST",
+        secureuri: false,
+        fileElementId: "welcomebgm",
+        dataType: "json",
+        success: function (data) {
+
+        },
+        error: function (data, status, e) {
+            $("#msg").html(e);
+        }
+    });
+}
+
 //保存酒店第三方对接信息
 function saveDockingInfo() {
     var form = $("#dialog").find("form");
diff --git a/WebSite/Views/SysHotel/EditDockingInfo.ascx b/WebSite/Views/SysHotel/EditDockingInfo.ascx
index a47bd9a..48ea0cc 100644
--- a/WebSite/Views/SysHotel/EditDockingInfo.ascx
+++ b/WebSite/Views/SysHotel/EditDockingInfo.ascx
@@ -1,4 +1,5 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<Domain.SysHotel>" %>
+<script src="/Scripts/ajaxfileupload.js" type="text/javascript"></script>
 <style type="text/css">
     #roomCardForm table th
     {
@@ -72,6 +73,17 @@
                 style="width: 416px;" value="<%: Model.WelcomeSpeech %>" />
         </td>
     </tr>
+    <tr>
+        <th align="right">
+            <label for="txtWelcomeSpeech">
+                <%: Html.Language("WelcomeBGM")%>：</label>
+        </th>
+        <td colspan="3">
+            <input id="welcomebgmid" name="welcomebgm" value="<%: Model.WelcomeBGM %>" readonly="readonly"/>
+            <input type="file" id="welcomebgm" name="file" size="30" />
+            <a href="#" class="easyui-linkbutton" data-options="iconCls:'icon-save'" onclick="uploadmusic();">Save</a>
+        </td>
+    </tr>
     <tr>
         <th align="right">
             <label for="txtGoodbyeSpeech">
@@ -150,8 +162,6 @@
                 <%: Model.FCSPushEnable ? "checked='checked'" : "" %> />
         </td>
     </tr>
-
-
     <tr>
         <th align="right">
             <label for="IsNewVersionProtocol">
@@ -162,39 +172,33 @@
                 <%: Model.IsNewVersionProtocol ? "checked='checked'" : "" %> />
         </td>
     </tr>
-
     <tr>
         <th align="right">
             <label for="txtFCSPushEnable">
                 FCS PropertyUUID：</label>
         </th>
         <td>
-           <input id="txt1" name="FCS_PropertyID" class="textbox text" value="<%: Model.FCS_PropertyID %>" />
+            <input id="txt1" name="FCS_PropertyID" class="textbox text" value="<%: Model.FCS_PropertyID %>" />
         </td>
     </tr>
-
-
-   <tr>
+    <tr>
         <th align="right">
             <label for="txt2">
                 FCS LoginUrl：</label>
         </th>
         <td>
-           <input id="txt2" name="FCSLoginUrl" class="textbox text" value="<%: Model.FCSLoginUrl %>" />
+            <input id="txt2" name="FCSLoginUrl" class="textbox text" value="<%: Model.FCSLoginUrl %>" />
         </td>
     </tr>
-
-   <tr>
+    <tr>
         <th align="right">
             <label for="txt3">
                 FCS LoginUserName：</label>
         </th>
         <td>
-           <input id="txt3" name="FCSLoginUserName" class="textbox text" value="<%: Model.FCSLoginUserName %>" />
+            <input id="txt3" name="FCSLoginUserName" class="textbox text" value="<%: Model.FCSLoginUserName %>" />
         </td>
     </tr>
-
-
     <tr>
         <th align="right">
             <label for="txt4">
@@ -204,8 +208,6 @@
             <input id="txt4" name="FCSLoginPassWord" class="textbox text" value="<%: Model.FCSLoginPassWord %>" />
         </td>
     </tr>
-
-
     <tr>
         <th align="right">
             <label for="txt5">
@@ -215,7 +217,6 @@
             <input id="txt5" name="FCS_Carbon_UUID" class="textbox text" value="<%: Model.FCS_Carbon_UUID %>" />
         </td>
     </tr>
-
     <tr>
         <th align="right">
             <label for="txt6">
@@ -225,17 +226,15 @@
             <input id="txt6" name="FCS_SOS_UUID" class="textbox text" value="<%: Model.FCS_SOS_UUID %>" />
         </td>
     </tr>
-
     <tr>
         <th align="right">
             <label for="txt7">
                 <%: Html.Language("FCS_TouSu_UUID")%>：</label>
         </th>
         <td>
-             <input id="txt7" name="FCS_TouSu_UUID" class="textbox text" value="<%: Model.FCS_TouSu_UUID %>" />
+            <input id="txt7" name="FCS_TouSu_UUID" class="textbox text" value="<%: Model.FCS_TouSu_UUID %>" />
         </td>
     </tr>
-
     <tr>
         <th align="right">
             <label for="txt8">
@@ -245,7 +244,6 @@
             <input id="txt8" name="FCS_Clean_UUID" class="textbox text" value="<%: Model.FCS_Clean_UUID %>" />
         </td>
     </tr>
-
     <tr>
         <th align="right">
             <label for="txt9">
@@ -255,18 +253,15 @@
             <input id="txt9" name="FCS_TiSongWuPin" class="textbox text" value="<%: Model.FCS_TiSongWuPin %>" />
         </td>
     </tr>
-
     <tr>
         <th align="right">
             <label for="txtFCSPushEnable">
                 <%: Html.Language("FCS_RCU_Device_Offline")%>：</label>
         </th>
         <td>
-             <input id="txt10" name="FCS_RCU_Device_Offline" class="textbox text" value="<%: Model.FCS_RCU_Device_Offline %>" />
+            <input id="txt10" name="FCS_RCU_Device_Offline" class="textbox text" value="<%: Model.FCS_RCU_Device_Offline %>" />
         </td>
     </tr>
-
-
     <tr>
         <th align="right">
             <label for="txt11">
@@ -276,7 +271,6 @@
             <input id="txt11" name="FCS_RCU_Offline" class="textbox text" value="<%: Model.FCS_RCU_Offline %>" />
         </td>
     </tr>
-
     <tr>
         <th align="right">
             <label for="txt12">
@@ -286,7 +280,6 @@
             <input id="txt12" name="FCS_RCU_Online" class="textbox text" value="<%: Model.FCS_RCU_Online %>" />
         </td>
     </tr>
-
     <tr>
         <th align="right">
             <label for="txt13">
@@ -296,17 +289,15 @@
             <input id="txt13" name="FCS_MenCi_Close" class="textbox text" value="<%: Model.FCS_MenCi_Close %>" />
         </td>
     </tr>
-
     <tr>
         <th align="right">
             <label for="txtFCSPushEnable">
                 <%: Html.Language("FCS_MenCi_Open")%>：</label>
         </th>
         <td>
-             <input id="txt14" name="FCS_MenCi_Open" class="textbox text" value="<%: Model.FCS_MenCi_Open %>" />
+            <input id="txt14" name="FCS_MenCi_Open" class="textbox text" value="<%: Model.FCS_MenCi_Open %>" />
         </td>
     </tr>
-
     <tr>
         <th align="right">
             <label for="isusechuangwei">
@@ -327,7 +318,6 @@
                 value="true" <%: Model.IsUseTCLTV ? "checked='checked'" : "" %> />
         </td>
     </tr>
-    
     <!--投诉反馈语音-->
     <tr>
         <th align="right">
@@ -350,7 +340,6 @@
                 style="width: 416px;" value="<%: Model.SkyworthTVauthCode %>" />
         </td>
     </tr>
-
     <tr>
         <th align="right">
             <label for="ckQianLiMaPMS">
@@ -371,24 +360,23 @@
                 value="true" <%: Model.IsPushPMSData ? "checked='checked'" : "" %> />
         </td>
     </tr>
-
     <tr>
         <th align="right">
             <label for="txtHeTongNumber">
                 <%: Html.Language("HeTongNumber")%>：</label>
         </th>
         <td>
-            <div style="display:inline;">
-                 <input id="txtHeTongNumber" name="HeTongNumber" class="easyui-validatebox textbox text"
-                    style="display:inline-block; width: 75px;" value="<%: Model.HeTongNumber %>" />
-                 <a class="easyui-linkbutton dlg-btn-save" style="display:inline-block;" href="javascript:void(0)" onclick="FoundDeviceList();">
-                    <%: Html.Language("FoundDevice")%></a> 
+            <div style="display: inline;">
+                <input id="txtHeTongNumber" name="HeTongNumber" class="easyui-validatebox textbox text"
+                    style="display: inline-block; width: 75px;" value="<%: Model.HeTongNumber %>" />
+                <a class="easyui-linkbutton dlg-btn-save" style="display: inline-block;" href="javascript:void(0)"
+                    onclick="FoundDeviceList();">
+                    <%: Html.Language("FoundDevice")%></a>
             </div>
         </td>
     </tr>
-
-<%--    TCL 功能--%>
-<%--    <tr>
+    <%--    TCL 功能--%>
+    <%--    <tr>
         <th align="right">
                TCL AppId 
         </th>
diff --git a/WebSite/Web.config b/WebSite/Web.config
index 77f71bf..cbf75c1 100644
--- a/WebSite/Web.config
+++ b/WebSite/Web.config
@@ -190,6 +190,8 @@
     <!--Hi 喂-->
     <add key="HiWeiAppId" value="wijsv8hf5izejkny"/>
     <add key="HiWeiAppSecret" value="6c1014dab24c41369068d12e4f7e145c"/>
+    <add key="webchat_redisstr" value="47.119.147.104:26379"/>
+    <add key="webchat_redis_pwd" value="1001^_^lool"/>
   </appSettings>
 
   <connectionStrings>