Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

昨天 07968530fd2a7c0d818adc8a89c96a9499dbbee6

 WebAPI/Global.asax.cs

@@ -12,14 +12,14 @@
        protected void Application_Start()
        {
            // webSocket 服务
            WebSocketServer.Start();
            // WebSocketServer.Start();
            GlobalConfiguration.Configure(WebApiConfig.Register);
        }

        // 应用关闭时，停止服务，防止泄露
        protected void Application_End()
        {
            WebSocketServer.Stop();
            // WebSocketServer.Stop();
        }
    }
}