调试修改内容提交【代码从此处产生新分支】

WCS.WebApi/Program.cs

@@ -20,9 +20,6 @@ namespace WebApi
     {
         public static void Main(string[] args)
         {
-<<<<<<< HEAD
-            WebSoceketManager.InitWebSocket();
-=======
             try
             {
                 //<2F><>ʼ<EFBFBD><CABC>websocket
@@ -30,7 +27,7 @@ namespace WebApi
 
                 //<2F><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>
                 DbInit.InitDb();
->>>>>>> 7f35077c07959e9571515ee1a1f88123f9e20bd5
+
 
                 //<2F><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
                 LocalFile.SaveConfig();
@@ -90,10 +87,10 @@ namespace WebApi
                 app.MapControllers();
                 app.Run("http://0.0.0.0:8888");//0.0.0.0<EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ipv4
             }
-            catch (Exception ex) 
-            { 
+            catch (Exception ex)
+            {
                 Console.WriteLine(ex.Message);
-            }        
+            }
         }
     }
 }